added distclean rule

uses Makefile.inc

CVS patchset: 1045
CVS date: 1996/09/25 19:12:53

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4f4d92e..bd78bd4 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,3 @@
-CC = @CC@
-CPP = @CPP@
-
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
@@ -8,19 +5,19 @@ LIBOBJECTS = header.o oldrpmdb.o misc.o messages.o rpmerr.o falloc.o \
             var.o md5.o md5sum.o dbindex.o rpmrc.o depends.o \
             rpmdb.o stringbuf.o rpmlead.o package.o uninstall.o \
             oldheader.o install.o signature.o verify.o rebuilddb.o
-SOURCES = $(subst .o,.c,$(LIBOBJECTS)) 
+SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS))) 
 TAGTABLE = tagtable.o
 LIBRPM = librpm.a
 LOADLIBES = -lrpm -lgdbm -ldb $(LIBEFENCE)
 PROGS = 
-AR = ar
-RANLIB = ranlib
 INSTALL= @INSTALL@
 INSTALL_PROGRAM= @INSTALL_PROGRAM@
 INSTALL_DATA= @INSTALL_DATA@
 
 # -----------------------------------------------------------------------
 
+include $(srcdir)/../Makefile.inc
+
 ifeq (.depend,$(wildcard .depend))
 TARGET=allprogs
 else
@@ -36,11 +33,11 @@ $(PROGS): $(LIBRPM)
 $(LIBRPM): $(LIBRPM)($(LIBOBJECTS) $(TAGTABLE))
        $(RANLIB) $@
 
-tagtable.c: rpmlib.h Makefile
+tagtable.c: rpmlib.h 
        echo '#include "rpmlib.h"' > tagtable.c
        echo '' >> tagtable.c
        echo 'const struct rpmTagTableEntry rpmTagTable[] = {' >> tagtable.c
-       awk '/(RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ { printf("\t{ \"%s\", %s },\n", $$2, $$3); }' < rpmlib.h >> tagtable.c
+       awk '/(RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ { printf("\t{ \"%s\", %s },\n", $$2, $$3); }' < $(srcdir)/rpmlib.h >> tagtable.c
        echo '};' >> tagtable.c
        echo '' >> tagtable.c
        echo 'const int rpmTagTableSize = sizeof(rpmTagTable) / sizeof(struct rpmTagTableEntry);' >> tagtable.c
@@ -55,6 +52,9 @@ install:
        $(INSTALL) -m 644 -o 0 -g 0 $(srcdir)/rpmerr.h $(INCDIR)
        $(INSTALL) -m 644 -o 0 -g 0 librpm.a $(LIBDIR)
 
+distclean: clean
+       rm -f .depend Makefile  
+
 clean:
        rm -f *.a *.o *~ $(PROGS) test.out tagtable.c