diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | optlib/Makefile.in | 7 | ||||
| -rw-r--r-- | utils/Makefile.in | 4 |
4 files changed, 12 insertions, 8 deletions
@@ -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 5251dc620..a90888eb5 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 c618589d4..e8632045f 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 fd0d785bf..e6c0d4d03 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) |