* 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 639336ee06352422b42e02fa15092d77c089305d..e9e77df3032e29bedae1a251be7e1c98a3e23dfe 100644 (file)
--- 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 5251dc620163d1113cb9bfa650d4f05245f02572..a90888eb5f66fff13895afc61e34d5c2aaaec04e 100644 (file)
--- 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 c618589d47e119cdeb4f69f4ff82aa3ab8b349e8..e8632045f224364f04c3e2484d9370f2a90caf3b 100644 (file)
--- 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 fd0d785bfe4f3e63c1255fee184129245196c2f8..e6c0d4d030c434b38a813aa819a6bf47c2bcf92a 100644 (file)
--- 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)