Eliminate rpm_malloc.h.

CVS patchset: 4131
CVS date: 2000/08/27 19:19:44

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b713064..e96a54e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,13 +12,12 @@ pkginc_HEADERS = \
        header.h misc.h rpmlib.h stringbuf.h
 noinst_HEADERS = \
        cpio.h depends.h falloc.h fprint.h hash.h install.h \
-       md5.h rpm_malloc.h \
-       rpmdb.h rpmlead.h signature.h
+       md5.h rpmdb.h rpmlead.h signature.h
 
 mylibpaths =   -L$(top_builddir)/lib/.libs -L$(top_builddir)/rpmio/.libs \
                -L$(top_builddir)/popt/.libs
 mylibs =       -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
-LIBS=
+LIBS =
 
 lib_LTLIBRARIES = librpm.la
 librpm_la_SOURCES = \
@@ -40,39 +39,6 @@ install-data-local:
 falloc.lo: falloc.c $(top_srcdir)/system.h $(top_srcdir)/rpmio/rpmio.h falloc.h
        $(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
-#db3.lo: db3.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
-#      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-#      for F in $*.o $*.lo ; do \
-#          @__LD@ -r -o $${F}.o $${F} @libdb3@ ; \
-#          @__OBJCOPY@ `\
-#              @__NM@ -g --defined-only $${F}.o | \
-#              sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \
-#              grep -v '^-L $*'` $${F}.o $${F} ; \
-#          rm -f $${F}.o ; \
-#      done
-
-#db2.lo: db2.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
-#      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-#      for F in $*.o $*.lo ; do \
-#          @__LD@ -r -o $${F}.o $${F} @libdb2@ ; \
-#          @__OBJCOPY@ `\
-#              @__NM@ -g --defined-only $${F}.o | \
-#              sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \
-#              grep -v '^-L $*'` $${F}.o $${F} ; \
-#          rm -f $${F}.o ; \
-#      done
-
-#db1.lo: db1.c falloc.lo $(top_srcdir)/system.h rpmlib.h rpmdb.h
-#      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-#      for F in $*.o $*.lo ; do \
-#          @__LD@ -r -o $${F}.o $${F} falloc.lo @libdb1@ ; \
-#          @__OBJCOPY@ `\
-#              @__NM@ -g --defined-only $${F}.o | \
-#              sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \
-#              grep -v '^-L $*' | grep -v '^-L fadio'` $${F}.o $${F} ; \
-#          rm -f $${F}.o ; \
-#      done
-
 tagtable.c: rpmlib.h 
        @echo '#include "system.h"' > tagtable.c
        @echo '#include "rpmlib.h"' >> tagtable.c

diff --git a/lib/rpm_malloc.h b/lib/rpm_malloc.h
deleted file mode 100644 (file)
index 6706ed8..0000000
--- a/lib/rpm_malloc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef H_RPM_MALLOC
-#define H_RPM_MALLOC
-
-/* placeholder */
-
-#endif /* H_RPM_MALLOC */