changed things around to dpkg-query builds more easily

diff --git a/ChangeLog b/ChangeLog
index b271aa2c5f894858902c6a8fd459c7d775f9b48d..66f6373670fa95509ce8dafaac8fc16c0719af12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 27 03:52:33 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/Makefile.in: changed things around to dpkg-query builds more
+    easily
+
 Fri Jul 27 03:43:52 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * main/query.c: remove -D from usage, we don't support it

diff --git a/main/Makefile.in b/main/Makefile.in
index 0574dd2daad1929c6070e90dbf7a96f75fcb6a92..ee07ba6c40495e772332f3438e96df51ab7ec2af 100644 (file)
--- a/main/Makefile.in
+++ b/main/Makefile.in
@@ -14,7 +14,9 @@ MAN8PAGES     = dpkg.8
 OBJECTS                = $(patsubst %.c, %.o, $(SOURCES))
 GENFILES       = $(OBJECTS) archtable.h dpkg dpkg-static
 
-dpkg-query:    SOURCES = query.c filesdb.c errors.c
+QUERY_SOURCES  = query.c showpkg.c filesdb.c errors.c 
+QUERY_OBJECTS  = $(patsubst %.c, %.o, $(QUERY_SOURCES))
+QUERY_GENFILES = $(QUERY_OBJECTS) dpkg-query
 
 .PHONY: all
 all:: dpkg dpkg-query
@@ -28,7 +30,7 @@ install:: all
 
 .PHONY: clean
 clean::
-       $(RM) $(GENFILES)
+       $(RM) $(GENFILES) $(QUERY_GENFILES)
 
 .PHONY: distclean
 cvslean:: clean
@@ -59,9 +61,11 @@ install-doc:
 
 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) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
+       $(CC) $(LDFLAGS) -o $@ $(LIBS) $(NLS_LIBS)
+
+dpkg-query: $(OQUERY_BJECTS) ../lib/libdpkg.a
+       $(CC) $(LDFLAGS) -o $@ $(QUERY_OBJECTS) $(LIBS) $(NLS_LIBS)
 
 enquiry.o: archtable.h