Use libtool to build libraries, but force --disable-shared for now.

CVS patchset: 2745
CVS date: 1999/01/22 18:42:31

diff --git a/Makefile.am b/Makefile.am
index 94405b0..3ad0bc9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,11 @@ SUBDIRS = popt build lib po intl misc tools scripts tests .
 
 INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@
 
-tbd = `pwd`/$(top_builddir)
+mylibs=        $(top_builddir)/build/librpmbuild.la \
+       $(top_builddir)/lib/librpm.la \
+       $(top_builddir)/popt/libpopt.la
 
-LDFLAGS = -all@LDFLAGS_STATIC@ -L$(tbd)/build -L$(tbd)/lib -L$(tbd)/popt -L$(tbd)/misc
+LDFLAGS = -all@LDFLAGS_STATIC@
 
 rpmbindir = $(subst usr/bin,bin,$(bindir))
 rpmbin_PROGRAMS = rpm
@@ -33,13 +35,11 @@ noinst_HEADERS = \
        install.h       system.h        url.h   \
        verify.h
 
-mylibs = ./build/librpmbuild.a ./lib/librpm.a ./popt/libpopt.a
-
 rpm_SOURCES =          build.c checksig.c ftp.c install.c rpm.c url.c \
                        verify.c
-rpm_LDADD =            -lrpmbuild -lrpm -lpopt @LIBMISC@
+rpm_LDADD =            $(mylibs) @LIBMISC@
 
-$(PROGRAMS): $(mylibs)
+$(PROGRAMS):           $(mylibs) @LIBMISC@
 
 include ./Makefile.inc
 
@@ -50,10 +50,10 @@ lclint:
 CVSTAG = r$(subst .,-,$(VERSION))
 
 rpm2cpio_SOURCES =     rpm2cpio.c
-rpm2cpio_LDADD =       -lrpmbuild -lrpm -lpopt
+rpm2cpio_LDADD =       $(mylibs)
 
 rpmconvert_SOURCES =   convertdb.c oldrpmdb.c
-rpmconvert_LDADD =     -lrpmbuild -lrpm -lpopt -lgdbm
+rpmconvert_LDADD =     $(mylibs) -lgdbm
 
 install-data-local:
        @$(mkinstalldirs) $(DESTDIR)/var/lib/rpm

diff --git a/Makefile.in b/Makefile.in
index a562393..a7748e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,9 +13,6 @@
 # Top level Makefile for rpm
 
 
-# Generated automatically from Makefile.inc.in by configure.
-
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -123,9 +120,10 @@ SUBDIRS = popt build lib po intl misc tools scripts tests .
 
 INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@
 
-tbd = `pwd`/$(top_builddir)
+mylibs = $(top_builddir)/build/librpmbuild.la  $(top_builddir)/lib/librpm.la   $(top_builddir)/popt/libpopt.la
 
-LDFLAGS = -all@LDFLAGS_STATIC@ -L$(tbd)/build -L$(tbd)/lib -L$(tbd)/popt -L$(tbd)/misc
+
+LDFLAGS = -all@LDFLAGS_STATIC@
 
 rpmbindir = $(subst usr/bin,bin,$(bindir))
 rpmbin_PROGRAMS = rpm
@@ -143,11 +141,9 @@ config_SCRIPTS = find-provides find-requires mkinstalldirs
 noinst_HEADERS =       acconfig.h      build.h         checksig.h      ftp.h           install.h       system.h        url.h           verify.h
 
 
-mylibs = ./build/librpmbuild.a ./lib/librpm.a ./popt/libpopt.a
-
 rpm_SOURCES = build.c checksig.c ftp.c install.c rpm.c url.c                   verify.c
 
-rpm_LDADD = -lrpmbuild -lrpm -lpopt @LIBMISC@
+rpm_LDADD = $(mylibs) @LIBMISC@
 
 CPP = gcc -E
 prefix = /usr
@@ -174,10 +170,10 @@ CC = gcc
 CVSTAG = r$(subst .,-,$(VERSION))
 
 rpm2cpio_SOURCES = rpm2cpio.c
-rpm2cpio_LDADD = -lrpmbuild -lrpm -lpopt
+rpm2cpio_LDADD = $(mylibs)
 
 rpmconvert_SOURCES = convertdb.c oldrpmdb.c
-rpmconvert_LDADD = -lrpmbuild -lrpm -lpopt -lgdbm
+rpmconvert_LDADD = $(mylibs) -lgdbm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -188,13 +184,16 @@ PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS) $(rpmbin_PROGRAMS)
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 rpm2cpio_OBJECTS =  rpm2cpio.o
-rpm2cpio_DEPENDENCIES = 
+rpm2cpio_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
+$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
 rpm2cpio_LDFLAGS = 
 rpmconvert_OBJECTS =  convertdb.o oldrpmdb.o
-rpmconvert_DEPENDENCIES = 
+rpmconvert_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
+$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
 rpmconvert_LDFLAGS = 
 rpm_OBJECTS =  build.o checksig.o ftp.o install.o rpm.o url.o verify.o
-rpm_DEPENDENCIES = 
+rpm_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
+$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
 rpm_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS) $(config_SCRIPTS)
 
@@ -772,7 +771,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$(PROGRAMS): $(mylibs)
+$(PROGRAMS):           $(mylibs) @LIBMISC@
 
 .PHONY:        lclint
 lclint:

diff --git a/autogen.sh b/autogen.sh
index 19b3a0f..1f199df 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ if [ "$1" = "--noconfigure" ]; then
 fi
 
 if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --disable-shared
 else
     ./configure "$@"
 fi

diff --git a/configure.in b/configure.in
index 731949f..ee320a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -445,7 +445,7 @@ if test "$LCHOWN" = no; then
     dnl Does chown() follow symlinks? This should be a good enough test.
     AC_MSG_CHECKING(whether chown() follows symlinks)
     AC_ARG_ENABLE([broken-chown],
-    [  --enable-broken-chown  this system's chown follows symbolic links], 
+    [  --enable-broken-chown   this system's chown follows symbolic links], 
            result=$enableval, result=unknown)
     if echo "$build" | egrep "(aix)|(hpux)|(linux)" > /dev/null ; then
        result=yes

diff --git a/lib/.cvsignore b/lib/.cvsignore
index 289842e..bae2fcc 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -2,3 +2,6 @@
 .depend
 Makefile
 tagtable.c
+.libs
+*.la
+*.lo

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 008b378..6b5866c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,8 +12,8 @@ noinst_HEADERS = \
        lookup.h md5.h oldheader.h oldrpmdb.h rpm_malloc.h \
        rpmdb.h rpmlead.h signature.h tread.h
 
-lib_LIBRARIES = librpm.a
-librpm_a_SOURCES = \
+lib_LTLIBRARIES = librpm.la
+librpm_la_SOURCES = \
        cpio.c dbindex.c depends.c falloc.c \
        formats.c fs.c header.c install.c \
        lookup.c macro.c md5.c md5sum.c \
@@ -38,4 +38,4 @@ BUILT_SOURCES = tagtable.c
 .PHONY:        lclint
 .PHONY:        lclint
 lclint:
-       lclint ${DEFS} ${INCLUDES} ${librpm_a_SOURCES}
+       lclint ${DEFS} ${INCLUDES} ${librpm_la_SOURCES}

diff --git a/lib/Makefile.in b/lib/Makefile.in
index ff69787..0e4cb72 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -137,26 +137,28 @@ rpminc_HEADERS =          dbindex.h header.h misc.h rpmio.h rpmlib.h rpmmacro.h stringb
 noinst_HEADERS =       cpio.h depends.h falloc.h fprint.h hash.h install.h     lookup.h md5.h oldheader.h oldrpmdb.h rpm_malloc.h      rpmdb.h rpmlead.h signature.h tread.h
 
 
-lib_LIBRARIES = librpm.a
-librpm_a_SOURCES =     cpio.c dbindex.c depends.c falloc.c     formats.c fs.c header.c install.c       lookup.c macro.c md5.c md5sum.c         messages.c misc.c oldheader.c package.c query.c         rebuilddb.c rpmdb.c rpmerr.c rpmio.c rpmbzio.c rpmlead.c        rpmrc.c signature.c stringbuf.c tagtable.c      tread.c uninstall.c verify.c transaction.c problems.c hash.c fprint.c
+lib_LTLIBRARIES = librpm.la
+librpm_la_SOURCES =    cpio.c dbindex.c depends.c falloc.c     formats.c fs.c header.c install.c       lookup.c macro.c md5.c md5sum.c         messages.c misc.c oldheader.c package.c query.c         rebuilddb.c rpmdb.c rpmerr.c rpmio.c rpmbzio.c rpmlead.c        rpmrc.c signature.c stringbuf.c tagtable.c      tread.c uninstall.c verify.c transaction.c problems.c hash.c fprint.c
 
 
 BUILT_SOURCES = tagtable.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(lib_LIBRARIES)
+LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-librpm_a_LIBADD = 
-librpm_a_OBJECTS =  cpio.o dbindex.o depends.o falloc.o formats.o fs.o \
-header.o install.o lookup.o macro.o md5.o md5sum.o messages.o misc.o \
-oldheader.o package.o query.o rebuilddb.o rpmdb.o rpmerr.o rpmio.o \
-rpmbzio.o rpmlead.o rpmrc.o signature.o stringbuf.o tagtable.o tread.o \
-uninstall.o verify.o transaction.o problems.o hash.o fprint.o
+librpm_la_LDFLAGS = 
+librpm_la_LIBADD = 
+librpm_la_OBJECTS =  cpio.lo dbindex.lo depends.lo falloc.lo formats.lo \
+fs.lo header.lo install.lo lookup.lo macro.lo md5.lo md5sum.lo \
+messages.lo misc.lo oldheader.lo package.lo query.lo rebuilddb.lo \
+rpmdb.lo rpmerr.lo rpmio.lo rpmbzio.lo rpmlead.lo rpmrc.lo signature.lo \
+stringbuf.lo tagtable.lo tread.lo uninstall.lo verify.lo transaction.lo \
+problems.lo hash.lo fprint.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -179,8 +181,8 @@ DEP_FILES =  .deps/cpio.P .deps/dbindex.P .deps/depends.P .deps/falloc.P \
 .deps/rpmdb.P .deps/rpmerr.P .deps/rpmio.P .deps/rpmlead.P \
 .deps/rpmrc.P .deps/signature.P .deps/stringbuf.P .deps/tagtable.P \
 .deps/transaction.P .deps/tread.P .deps/uninstall.P .deps/verify.P
-SOURCES = $(librpm_a_SOURCES)
-OBJECTS = $(librpm_a_OBJECTS)
+SOURCES = $(librpm_la_SOURCES)
+OBJECTS = $(librpm_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -193,36 +195,29 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-libLIBRARIES:
+mostlyclean-libLTLIBRARIES:
 
-clean-libLIBRARIES:
-       -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 
-distclean-libLIBRARIES:
+distclean-libLTLIBRARIES:
 
-maintainer-clean-libLIBRARIES:
+maintainer-clean-libLTLIBRARIES:
 
-install-libLIBRARIES: $(lib_LIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(libdir)
-       @list='$(lib_LIBRARIES)'; for p in $$list; do \
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
-         else :; fi; \
-       done
-       @$(POST_INSTALL)
-       @list='$(lib_LIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-           $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+           echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+           $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
          else :; fi; \
        done
 
-uninstall-libLIBRARIES:
+uninstall-libLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(libdir)/$$p; \
+       list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
        done
 
 .s.o:
@@ -257,10 +252,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-librpm.a: $(librpm_a_OBJECTS) $(librpm_a_DEPENDENCIES)
-       -rm -f librpm.a
-       $(AR) cru librpm.a $(librpm_a_OBJECTS) $(librpm_a_LIBADD)
-       $(RANLIB) librpm.a
+librpm.la: $(librpm_la_OBJECTS) $(librpm_la_DEPENDENCIES)
+       $(LINK) -rpath $(libdir) $(librpm_la_LDFLAGS) $(librpm_la_OBJECTS) $(librpm_la_LIBADD) $(LIBS)
 
 install-rpmincHEADERS: $(rpminc_HEADERS)
        @$(NORMAL_INSTALL)
@@ -366,7 +359,7 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
-install-exec-am: install-libLIBRARIES
+install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-am
 
 install-data-am: install-rpmincHEADERS
@@ -375,9 +368,9 @@ install-data: install-data-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-libLIBRARIES uninstall-rpmincHEADERS
+uninstall-am: uninstall-libLTLIBRARIES uninstall-rpmincHEADERS
 uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -395,25 +388,25 @@ distclean-generic:
 
 maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-libLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
                mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
                mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-libLIBRARIES clean-compile clean-libtool clean-tags \
+clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
                clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-libLIBRARIES distclean-compile \
+distclean-am:  distclean-libLTLIBRARIES distclean-compile \
                distclean-libtool distclean-tags distclean-depend \
                distclean-generic clean-am
        -rm -f libtool
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-libLIBRARIES \
+maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
                maintainer-clean-tags maintainer-clean-depend \
                maintainer-clean-generic distclean-am
@@ -422,14 +415,14 @@ maintainer-clean-am:  maintainer-clean-libLIBRARIES \
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \
-clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
-install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile mostlyclean-libtool \
-distclean-libtool clean-libtool maintainer-clean-libtool \
-uninstall-rpmincHEADERS install-rpmincHEADERS tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool uninstall-rpmincHEADERS install-rpmincHEADERS \
+tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+distdir mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info-am info dvi-am dvi check check-am \
 installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
@@ -452,7 +445,7 @@ tagtable.c: rpmlib.h
 .PHONY:        lclint
 .PHONY:        lclint
 lclint:
-       lclint ${DEFS} ${INCLUDES} ${librpm_a_SOURCES}
+       lclint ${DEFS} ${INCLUDES} ${librpm_la_SOURCES}
 
 # 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.

diff --git a/misc/.cvsignore b/misc/.cvsignore
index 7401f9d..2784cab 100644 (file)
--- a/misc/.cvsignore
+++ b/misc/.cvsignore
@@ -1,3 +1,6 @@
 .deps
 .depend
 Makefile
+.libs
+*.la
+*.lo

diff --git a/misc/Makefile.am b/misc/Makefile.am
index b590e46..d22fa70 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -18,9 +18,9 @@ noinst_HEADERS = \
        libgettext.h    message.h       po-lex.h        str-list.h      \
        fstrcmp.h
 
-noinst_LIBRARIES = libmisc.a
+noinst_LTLIBRARIES = libmisc.la
 
-libmisc_a_SOURCES =
+libmisc_la_SOURCES =
 
-libmisc_a_LIBADD = @LIBOBJS@ @ALLOCA@
-libmisc_a_DEPENDENCIES = $(libmisc_a_LIBADD)
+libmisc_la_LIBADD = @LIBOBJS@ @ALLOCA@
+libmisc_la_DEPENDENCIES = $(libmisc_la_LIBADD)

diff --git a/misc/Makefile.in b/misc/Makefile.in
index e31314d..6f0449d 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -137,22 +137,23 @@ EXTRA_DIST =      alloca.c        error.c         fakefork.c      fnmatch.c               getcwd.c        getmntent.c     getw
 noinst_HEADERS =       error.h         fnmatch.h       glob.h                                  libgettext.h    message.h       po-lex.h        str-list.h              fstrcmp.h
 
 
-noinst_LIBRARIES = libmisc.a
+noinst_LTLIBRARIES = libmisc.la
 
-libmisc_a_SOURCES = 
+libmisc_la_SOURCES = 
 
-libmisc_a_LIBADD = @LIBOBJS@ @ALLOCA@
-libmisc_a_DEPENDENCIES = $(libmisc_a_LIBADD)
+libmisc_la_LIBADD = @LIBOBJS@ @ALLOCA@
+libmisc_la_DEPENDENCIES = $(libmisc_la_LIBADD)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-libmisc_a_OBJECTS = 
+libmisc_la_LDFLAGS = 
+libmisc_la_OBJECTS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -176,8 +177,8 @@ DEP_FILES =  .deps/alloca.P .deps/error.P .deps/fnmatch.P .deps/getcwd.P \
 .deps/stpncpy.P .deps/strcasecmp.P .deps/strcspn.P .deps/strdup.P \
 .deps/strerror.P .deps/strncasecmp.P .deps/strspn.P .deps/strstr.P \
 .deps/strtol.P .deps/strtoul.P
-SOURCES = $(libmisc_a_SOURCES)
-OBJECTS = $(libmisc_a_OBJECTS)
+SOURCES = $(libmisc_la_SOURCES)
+OBJECTS = $(libmisc_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -190,14 +191,14 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLIBRARIES:
+mostlyclean-noinstLTLIBRARIES:
 
-clean-noinstLIBRARIES:
-       -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 
-distclean-noinstLIBRARIES:
+distclean-noinstLTLIBRARIES:
 
-maintainer-clean-noinstLIBRARIES:
+maintainer-clean-noinstLTLIBRARIES:
 
 .s.o:
        $(COMPILE) -c $<
@@ -231,10 +232,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-libmisc.a: $(libmisc_a_OBJECTS) $(libmisc_a_DEPENDENCIES)
-       -rm -f libmisc.a
-       $(AR) cru libmisc.a $(libmisc_a_OBJECTS) $(libmisc_a_LIBADD)
-       $(RANLIB) libmisc.a
+libmisc.la: $(libmisc_la_OBJECTS) $(libmisc_la_DEPENDENCIES)
+       $(LINK)  $(libmisc_la_LDFLAGS) $(libmisc_la_OBJECTS) $(libmisc_la_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -336,7 +335,7 @@ install-am: all-am
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -352,25 +351,25 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
                mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
                mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-               clean-depend clean-generic mostlyclean-am
+clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+               clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
                distclean-libtool distclean-tags distclean-depend \
                distclean-generic clean-am
        -rm -f libtool
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
                maintainer-clean-tags maintainer-clean-depend \
                maintainer-clean-generic distclean-am
@@ -379,8 +378,8 @@ maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \

diff --git a/popt/.cvsignore b/popt/.cvsignore
index f90b971..d3f6c72 100644 (file)
--- a/popt/.cvsignore
+++ b/popt/.cvsignore
@@ -16,3 +16,7 @@ test1
 libtool
 ltconfig
 ltmain.sh
+.libs
+*.la
+*.lo
+popt-*.tar.gz

diff --git a/popt/Makefile.am b/popt/Makefile.am
index ee3f239..c897002 100644 (file)
--- a/popt/Makefile.am
+++ b/popt/Makefile.am
@@ -7,8 +7,6 @@ EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
 
 SUBDIRS = po
 
-tbd = `pwd`/$(top_builddir)
-LDFLAGS = -L$(tbd)
 INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h

diff --git a/popt/Makefile.in b/popt/Makefile.in
index f8b31ab..885680a 100644 (file)
--- a/popt/Makefile.in
+++ b/popt/Makefile.in
@@ -83,8 +83,6 @@ EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h      testit
 
 SUBDIRS = po
 
-tbd = `pwd`/$(top_builddir)
-LDFLAGS = -L$(tbd)
 INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h

diff --git a/popt/autogen.sh b/popt/autogen.sh
index fd0c14d..d5f4d10 100755 (executable)
--- a/popt/autogen.sh
+++ b/popt/autogen.sh
@@ -7,4 +7,8 @@ if [ "$1" = "--noconfigure" ]; then
     exit 0;
 fi
 
-./configure "$@"
+if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
+    ./configure --prefix=/usr --disable-shared
+else
+    ./configure "$@"
+fi

diff --git a/popt/popt.spec b/popt/popt.spec
index 53909df..5fba883 100644 (file)
--- a/popt/popt.spec
+++ b/popt/popt.spec
@@ -18,7 +18,7 @@ argv[] arrays using shell-like rules.
 
 %prep
 %setup -q
-CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=/usr
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --disable-shared
 
 %build
 make

diff --git a/rpm.spec b/rpm.spec
index 1ac14ea..20d278a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@ intimate knowledge of RPM packages.
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --disable-shared
 make
 
 %install

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 61ef453..f5e93a3 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,19 +4,21 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/misc @INCPATH@
 
-tbd = `pwd`/$(top_builddir)
-LDFLAGS = -L$(tbd)/popt -L$(tbd)/build -L$(tbd)/lib -L$(tbd)/misc
-LDADD = -lrpm
-
 EXTRA_DIST =   fstrcmp.c message.c str-list.c rpmchecksig.c
 
+mylibs=        $(top_builddir)/build/librpmbuild.la \
+       $(top_builddir)/lib/librpm.la \
+       $(top_builddir)/popt/libpopt.la
+
+LDADD = $(top_builddir)/lib/librpm.la
+
 noinst_PROGRAMS = rpmlead rpmheader rpmarchive rpmsignature dump dumpdb \
        rpmgettext rpmputtext
 
 rpmgettext_SOURCES =   rpmgettext.c
-rpmgettext_LDADD =     -lrpmbuild -lpopt -lrpm @LIBMISC@
+rpmgettext_LDADD =     $(mylibs) @LIBMISC@
 
 rpmputtext_SOURCES =   rpmgettext.c
-rpmputtext_LDADD =     -lrpmbuild -lpopt -lrpm @LIBMISC@
+rpmputtext_LDADD =     $(mylibs) @LIBMISC@
 
-$(PROGRAMS): ../build/librpmbuild.a ../lib/librpm.a ../popt/libpopt.a
+$(PROGRAMS): $(mylibs)

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 81df915..e8e3d11 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -131,20 +131,21 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/misc @INCPATH@
 
-tbd = `pwd`/$(top_builddir)
-LDFLAGS = -L$(tbd)/popt -L$(tbd)/build -L$(tbd)/lib -L$(tbd)/misc
-LDADD = -lrpm
-
 EXTRA_DIST = fstrcmp.c message.c str-list.c rpmchecksig.c
 
+mylibs = $(top_builddir)/build/librpmbuild.la  $(top_builddir)/lib/librpm.la   $(top_builddir)/popt/libpopt.la
+
+
+LDADD = $(top_builddir)/lib/librpm.la
+
 noinst_PROGRAMS = rpmlead rpmheader rpmarchive rpmsignature dump dumpdb        rpmgettext rpmputtext
 
 
 rpmgettext_SOURCES = rpmgettext.c
-rpmgettext_LDADD = -lrpmbuild -lpopt -lrpm @LIBMISC@
+rpmgettext_LDADD = $(mylibs) @LIBMISC@
 
 rpmputtext_SOURCES = rpmgettext.c
-rpmputtext_LDADD = -lrpmbuild -lpopt -lrpm @LIBMISC@
+rpmputtext_LDADD = $(mylibs) @LIBMISC@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -153,41 +154,44 @@ PROGRAMS =  $(noinst_PROGRAMS)
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
 rpmlead_SOURCES = rpmlead.c
 rpmlead_OBJECTS =  rpmlead.o
 rpmlead_LDADD = $(LDADD)
-rpmlead_DEPENDENCIES = 
+rpmlead_DEPENDENCIES =  $(top_builddir)/lib/librpm.la
 rpmlead_LDFLAGS = 
 rpmheader_SOURCES = rpmheader.c
 rpmheader_OBJECTS =  rpmheader.o
 rpmheader_LDADD = $(LDADD)
-rpmheader_DEPENDENCIES = 
+rpmheader_DEPENDENCIES =  $(top_builddir)/lib/librpm.la
 rpmheader_LDFLAGS = 
 rpmarchive_SOURCES = rpmarchive.c
 rpmarchive_OBJECTS =  rpmarchive.o
 rpmarchive_LDADD = $(LDADD)
-rpmarchive_DEPENDENCIES = 
+rpmarchive_DEPENDENCIES =  $(top_builddir)/lib/librpm.la
 rpmarchive_LDFLAGS = 
 rpmsignature_SOURCES = rpmsignature.c
 rpmsignature_OBJECTS =  rpmsignature.o
 rpmsignature_LDADD = $(LDADD)
-rpmsignature_DEPENDENCIES = 
+rpmsignature_DEPENDENCIES =  $(top_builddir)/lib/librpm.la
 rpmsignature_LDFLAGS = 
 dump_SOURCES = dump.c
 dump_OBJECTS =  dump.o
 dump_LDADD = $(LDADD)
-dump_DEPENDENCIES = 
+dump_DEPENDENCIES =  $(top_builddir)/lib/librpm.la
 dump_LDFLAGS = 
 dumpdb_SOURCES = dumpdb.c
 dumpdb_OBJECTS =  dumpdb.o
 dumpdb_LDADD = $(LDADD)
-dumpdb_DEPENDENCIES = 
+dumpdb_DEPENDENCIES =  $(top_builddir)/lib/librpm.la
 dumpdb_LDFLAGS = 
 rpmgettext_OBJECTS =  rpmgettext.o
-rpmgettext_DEPENDENCIES = 
+rpmgettext_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
+$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
 rpmgettext_LDFLAGS = 
 rpmputtext_OBJECTS =  rpmgettext.o
-rpmputtext_DEPENDENCIES = 
+rpmputtext_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
+$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
 rpmputtext_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -449,7 +453,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-$(PROGRAMS): ../build/librpmbuild.a ../lib/librpm.a ../popt/libpopt.a
+$(PROGRAMS): $(mylibs)
 
 # 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.