Преглед на файлове

* 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

Ben Collins преди 25 години
родител
ревизия
4746ad0958
променени са 4 файла, в които са добавени 12 реда и са изтрити 8 реда
  1. 7 0
      ChangeLog
  2. 1 1
      lib/Makefile.in
  3. 2 5
      optlib/Makefile.in
  4. 2 2
      utils/Makefile.in

+ 7 - 0
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

+ 1 - 1
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) $@
 

+ 2 - 5
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
 

+ 2 - 2
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)