Add library dependencies.

Remake with latest automake.

CVS patchset: 2565
CVS date: 1998/11/30 20:54:35

diff --git a/Makefile.am b/Makefile.am
index 20faa87..6342db0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = popt build lib po intl misc tools scripts tests
 
 INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@
 
-LDFLAGS = @LDFLAGS_STATIC@ -L$(top_builddir)/popt -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/misc
+LDFLAGS = @LDFLAGS_STATIC@ -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt -L$(top_builddir)/misc
 
 rpmbindir = $(subst usr/bin,bin,$(bindir))
 rpmbin_PROGRAMS = rpm
@@ -28,14 +28,9 @@ noinst_HEADERS = \
 
 rpm_SOURCES =          build.c checksig.c ftp.c install.c rpm.c url.c \
                        verify.c
-rpm_LDADD =            -lrpmbuild -lpopt -lrpm @LIBMISC@
+rpm_LDADD =            -lrpmbuild -lrpm -lpopt @LIBMISC@
 
-#rpm.o:        rpm.c
-#      $(COMPILE) \
-#              -DLOCALEDIR=\"$(LOCALEDIR)\" \
-#              -DLIBRPMALIAS_FILENAME=\"$(LIBRPMALIAS_FILENAME)\" \
-#              -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
-#              -c $<
+$(PROGRAMS): ./build/librpmbuild.a ./lib/librpm.a ./popt/libpopt.a
 
 include ./Makefile.inc
 
@@ -46,10 +41,10 @@ lclint:
 CVSTAG = r$(subst .,-,$(VERSION))
 
 rpm2cpio_SOURCES =     rpm2cpio.c
-rpm2cpio_LDADD =       -lrpmbuild -lpopt -lrpm
+rpm2cpio_LDADD =       -lrpmbuild -lrpm -lpopt
 
 rpmconvert_SOURCES =   convertdb.c oldrpmdb.c
-rpmconvert_LDADD =     -lrpmbuild -lpopt -lrpm -lgdbm
+rpmconvert_LDADD =     -lrpmbuild -lrpm -lpopt -lgdbm
 
 install-data-local:
        @$(mkinstalldirs) $(DESTDIR)/var/lib/rpm

diff --git a/Makefile.in b/Makefile.in
index 1b38bca..9ac766c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.3b from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -34,7 +34,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -124,7 +124,7 @@ SUBDIRS = popt build lib po intl misc tools scripts tests
 
 INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@
 
-LDFLAGS = @LDFLAGS_STATIC@ -L$(top_builddir)/popt -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/misc
+LDFLAGS = @LDFLAGS_STATIC@ -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt -L$(top_builddir)/misc
 
 rpmbindir = $(subst usr/bin,bin,$(bindir))
 rpmbin_PROGRAMS = rpm
@@ -146,15 +146,15 @@ noinst_HEADERS = \
 
 rpm_SOURCES =          build.c checksig.c ftp.c install.c rpm.c url.c \
                        verify.c
-rpm_LDADD =            -lrpmbuild -lpopt -lrpm @LIBMISC@
+rpm_LDADD =            -lrpmbuild -lrpm -lpopt @LIBMISC@
 
 CVSTAG = r$(subst .,-,$(VERSION))
 
 rpm2cpio_SOURCES =     rpm2cpio.c
-rpm2cpio_LDADD =       -lrpmbuild -lpopt -lrpm
+rpm2cpio_LDADD =       -lrpmbuild -lrpm -lpopt
 
 rpmconvert_SOURCES =   convertdb.c oldrpmdb.c
-rpmconvert_LDADD =     -lrpmbuild -lpopt -lrpm -lgdbm
+rpmconvert_LDADD =     -lrpmbuild -lrpm -lpopt -lgdbm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -176,8 +176,8 @@ rpm_LDFLAGS =
 SCRIPTS =  $(bin_SCRIPTS) $(config_SCRIPTS)
 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 man8dir = $(mandir)/man8
 MANS = $(man_MANS)
 
@@ -194,7 +194,7 @@ missing mkinstalldirs stamp-h.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP = --best
 DEP_FILES =  .deps/build.P .deps/checksig.P .deps/convertdb.P \
 .deps/ftp.P .deps/install.P .deps/oldrpmdb.P .deps/rpm.P \
@@ -216,7 +216,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 $(ACLOCAL_M4):  configure.in 
        cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
@@ -242,11 +242,11 @@ distclean-hdr:
 
 maintainer-clean-hdr:
 Makefile.inc: $(top_builddir)/config.status Makefile.inc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 lib-rpmrc: $(top_builddir)/config.status lib-rpmrc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 macros: $(top_builddir)/config.status macros.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-binPROGRAMS:
 
@@ -262,15 +262,15 @@ install-binPROGRAMS: $(bin_PROGRAMS)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        @list='$(bin_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-            $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+           echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+            $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
 uninstall-binPROGRAMS:
        @$(NORMAL_UNINSTALL)
        list='$(bin_PROGRAMS)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
        done
 
 mostlyclean-noinstPROGRAMS:
@@ -296,15 +296,15 @@ install-rpmbinPROGRAMS: $(rpmbin_PROGRAMS)
        $(mkinstalldirs) $(DESTDIR)$(rpmbindir)
        @list='$(rpmbin_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(rpmbindir)/`echo $$p|sed '$(transform)'`"; \
-            $(INSTALL_PROGRAM) $$p $(DESTDIR)$(rpmbindir)/`echo $$p|sed '$(transform)'`; \
+           echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(rpmbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+            $(INSTALL_PROGRAM) $$p $(DESTDIR)$(rpmbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
 uninstall-rpmbinPROGRAMS:
        @$(NORMAL_UNINSTALL)
        list='$(rpmbin_PROGRAMS)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(rpmbindir)/`echo $$p|sed '$(transform)'`; \
+         rm -f $(DESTDIR)$(rpmbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
        done
 
 .s.o:
@@ -407,10 +407,10 @@ uninstall-man8:
        done
 install-man: $(MANS)
        @$(NORMAL_INSTALL)
-       $(MAKE) install-man8
+       $(MAKE) $(AM_MAKEFLAGS) install-man8
 uninstall-man:
        @$(NORMAL_UNINSTALL)
-       $(MAKE) uninstall-man8
+       $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
 
 install-configDATA: $(config_DATA)
        @$(NORMAL_INSTALL)
@@ -447,7 +447,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $$target) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
 
@@ -460,12 +460,12 @@ maintainer-clean-recursive:
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $$target) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         (cd $$subdir && $(MAKE) tags); \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
        done
 
 tags: TAGS
@@ -510,12 +510,12 @@ distcheck: dist
        dc_install_base=`cd $(distdir)/=inst && pwd`; \
        cd $(distdir)/=build \
          && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
-         && $(MAKE) \
-         && $(MAKE) dvi \
-         && $(MAKE) check \
-         && $(MAKE) install \
-         && $(MAKE) installcheck \
-         && $(MAKE) dist
+         && $(MAKE) $(AM_MAKEFLAGS) \
+         && $(MAKE) $(AM_MAKEFLAGS) dvi \
+         && $(MAKE) $(AM_MAKEFLAGS) check \
+         && $(MAKE) $(AM_MAKEFLAGS) install \
+         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+         && $(MAKE) $(AM_MAKEFLAGS) dist
        -rm -rf $(distdir)
        @echo "========================"; \
        echo "$(distdir).tar.gz is ready for distribution"; \
@@ -548,7 +548,7 @@ distdir: $(DISTFILES)
          || mkdir $(distdir)/$$subdir \
          || exit 1; \
          chmod 777 $(distdir)/$$subdir; \
-         (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
 
@@ -578,10 +578,10 @@ maintainer-clean-depend:
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
-       $(MAKE) check-recursive
+       $(MAKE) $(AM_MAKEFLAGS) check-recursive
 installcheck: installcheck-recursive
 all-recursive-am: config.h
-       $(MAKE) all-recursive
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) config.h
 
@@ -603,27 +603,22 @@ install: install-recursive install-exec-am install-data-am
 uninstall: uninstall-recursive uninstall-am
 
 install-strip:
-       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
-       $(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(rpmbindir) \
-               $(DATADIR)$(bindir) $(DATADIR)$(configdir) \
-               $(DESTDIR)$(mandir)/man8 $(DATADIR)$(configdir)
+       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(rpmbindir) \
+               $(DESTDIR)$(bindir) $(DESTDIR)$(configdir) \
+               $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(configdir)
 
 
 mostlyclean-generic:
-       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
                mostlyclean-noinstPROGRAMS mostlyclean-rpmbinPROGRAMS \
                mostlyclean-compile mostlyclean-tags mostlyclean-depend \
@@ -683,12 +678,7 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
-#rpm.o:        rpm.c
-#      $(COMPILE) \
-#              -DLOCALEDIR=\"$(LOCALEDIR)\" \
-#              -DLIBRPMALIAS_FILENAME=\"$(LIBRPMALIAS_FILENAME)\" \
-#              -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
-#              -c $<
+$(PROGRAMS): ./build/librpmbuild.a ./lib/librpm.a ./popt/libpopt.a
 
 include ./Makefile.inc
 

diff --git a/po/rpm.pot b/po/rpm.pot
index c5d1e53..5236d48 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-30 12:56-0500\n"
+"POT-Creation-Date: 1998-11-30 15:51-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5d2539b..87c46f9 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,4 +18,4 @@ rpmgettext_LDADD =    -lrpmbuild -lpopt -lrpm @LIBMISC@
 rpmputtext_SOURCES =   rpmgettext.c
 rpmputtext_LDADD =     -lrpmbuild -lpopt -lrpm @LIBMISC@
 
-$(PROGRAMS): ../lib/librpm.a
+$(PROGRAMS): ../build/librpmbuild.a ../lib/librpm.a ../popt/libpopt.a

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 50603be..69e4a3d 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.3b from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -34,7 +34,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -180,14 +180,14 @@ rpmputtext_OBJECTS =  rpmgettext.o
 rpmputtext_DEPENDENCIES = 
 rpmputtext_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP = --best
 DEP_FILES =  .deps/dump.P .deps/dumpdb.P .deps/rpmarchive.P \
 .deps/rpmgettext.P .deps/rpmheader.P .deps/rpmlead.P \
@@ -332,7 +332,6 @@ maintainer-clean-depend:
 info:
 dvi:
 check: all
-       $(MAKE)
 installcheck:
 install-exec: 
        @$(NORMAL_INSTALL)
@@ -346,24 +345,19 @@ install: install-exec install-data all
 uninstall: 
 
 install-strip:
-       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
 mostlyclean-generic:
-       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
                mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
@@ -392,7 +386,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$(PROGRAMS): ../lib/librpm.a
+$(PROGRAMS): ../build/librpmbuild.a ../lib/librpm.a ../popt/libpopt.a
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.