From: Ben Collins <bcollins@debian.org>
Date: Thu, 15 Feb 2001 16:32:48 +0000 (+0000)
Subject:   * utils/Makefile.in: Do not use libopt.a, since libdpkg.a not includes those
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4746ad095816eee0dfecbd64ce5bea2f60122648;p=dpkg

  * utils/Makefile.in: Do not use libopt.a, since libdpkg.a not includes those
    objects
  * optlib/Makefile.in: do not generate libopt.a
  * lib/Makefile.in: build libdpkg.a to include the objects from optlib
---

diff --git a/ChangeLog b/ChangeLog
index 639336ee..e9e77df3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 15 11:24:46 EST 2001 Ben Collins <bcollins@debian.org>
+
+  * utils/Makefile.in: Do not use libopt.a, since libdpkg.a not includes those
+    objects
+  * optlib/Makefile.in: do not generate libopt.a
+  * lib/Makefile.in: build libdpkg.a to include the objects from optlib
+
 Sat Feb  3 18:25:25 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/rules: use POSIX glob instead of regexp
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5251dc62..a90888eb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -17,7 +17,7 @@ ALL_CFLAGS	+= -DCOPYINGFILE=\"$(copyingfile)\"
 .PHONY: all
 all:: libdpkg.a
 	
-libdpkg.a: $(OBJECTS)
+libdpkg.a: $(OBJECTS) ../opt/*.o
 	$(AR) r $@ $^
 	$(RANLIB) $@
 
diff --git a/optlib/Makefile.in b/optlib/Makefile.in
index c618589d..e8632045 100644
--- a/optlib/Makefile.in
+++ b/optlib/Makefile.in
@@ -7,14 +7,11 @@ include ../Makefile.conf
 SOURCES		= getopt.c getopt1.c long-options.c closeout.c obstack.c
 
 OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
-GENFILES	= $(OBJECTS) libopt.a
+GENFILES	= $(OBJECTS)
 
 .PHONY: all
-all:: libopt.a
+all:: $(OBJECTS)
 	
-libopt.a: $(OBJECTS)
-	$(AR) r $@ $^
-
 .PHONY: install
 install:: all
 
diff --git a/utils/Makefile.in b/utils/Makefile.in
index fd0d785b..e6c0d4d0 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -60,8 +60,8 @@ endif
 	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
 	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
 
-start-stop-daemon: $(SSD_OBJECTS) ../optlib/libopt.a
+start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
 	$(CC) $(LDFLAGS) -o $@ $^ $(SSD_LIBS)
 
-md5sum: $(MD5_OBJECTS) ../optlib/libopt.a ../lib/libdpkg.a
+md5sum: $(MD5_OBJECTS) ../lib/libdpkg.a
 	$(CC) $(LDFLAGS) -o $@ $^ $(NLS_LIBS)