Discovered that if anything in optlib/ was actually needed, it wasn't being

included.  Modified LDFLAGS to include -L../optlib, and moved -ldpkg and
-loptlib to LDFLAGS as well.

Makefile.conf.in

@@ -51,8 +51,8 @@ CXX			= @CXX@
 CXXFLAGS		= @CXXFLAGS@
 
 LD			= @LD@
-LDFLAGS			= @LDFLAGS@
-LIBS			= @LIBS@
+LDFLAGS			= @LDFLAGS@ -L../lib -L../optlib
+LIBS			= @LIBS@ -ldpkg -lopt $(ZLIB_LIBS)
 
 RANLIB			= @RANLIB@
 

dpkg-deb/Makefile.in

@@ -49,5 +49,5 @@ install-doc:
 dpkg-deb-static: LDFLAGS += -static
 dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC)
 dpkg-deb dpkg-deb-static: $(OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -L../lib -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg $(ZLIB_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
 

dselect/Makefile.in

@@ -47,7 +47,7 @@ install-doc:
 	done
 
 dselect: $(OBJECTS) ../lib/libdpkg.a
-	$(CXX) $(LDFLAGS) -L../lib -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg -lncurses
+	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -lncurses $(LIBS) $(NLS_LIBS)
 
 basecmds.o: helpmsgs.h
 curkeys.o: curkeys.h

lib/Makefile.in

@@ -17,10 +17,7 @@ ALL_CFLAGS	+= -DCOPYINGFILE=\"$(copyingfile)\"
 .PHONY: all
 all:: libdpkg.a
 
-../optlib/libopt.a:
-	set -e ; cd ../optlib ; $(MAKE) libopt.a
-
-libdpkg.a: $(OBJECTS) ../optlib/libopt.a
+libdpkg.a: $(OBJECTS) 
 	$(AR) r $@ $^
 	$(RANLIB) $@
 

main/Makefile.in

@@ -60,7 +60,7 @@ dpkg-static: LDFLAGS += -static
 dpkg dpkg-static: $(OBJECTS) ../lib/libdpkg.a
 dpkg-query: $(OBJECTS) query.o ../lib/libdpkg.a
 dpkg dpkg-static dpkg-query:
-	$(CC) $(LDFLAGS) -L../lib -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
 
 enquiry.o: archtable.h
 

split/Makefile.in

@@ -41,7 +41,7 @@ install-doc:
 	$(INSTALL_DATA) $(srcdir)/dpkg-split.8 $(DESTDIR)/$(man8dir)
 
 dpkg-split: $(SPLIT_OBJECTS) 
-	$(CC) $(LDFLAGS) -L../lib -o $@ $(SPLIT_OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg
+	$(CC) $(LDFLAGS) -o $@ $(SPLIT_OBJECTS) $(LIBS) $(NLS_LIBS)
 
 split.o: split.c
 	$(CC) $(ALL_CFLAGS) -DMKSPLITSCRIPT=\"$(dpkglibdir)/mksplit\" -c $<

utils/Makefile.in

@@ -72,8 +72,8 @@ endif
 	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
 
 start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $^ $(SSD_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
 
 md5sum-static: LDFLAGS += -static
 md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
-	$(CC) $(LDFLAGS) -o $@ $^ $(NLS_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)