diff options
| author | jbj <devnull@localhost> | 2000-02-24 22:28:31 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2000-02-24 22:28:31 +0000 |
| commit | 466f98a9fb5d0609afa370462e415d4fdead07c9 (patch) | |
| tree | aad1646fcc771512ec2206b7d00378d9b0d5c4b7 /Makefile.am | |
| parent | fc45026a9e1bd32ef8dec83f2e3bdac3262820b8 (diff) | |
| download | librpm-tizen-466f98a9fb5d0609afa370462e415d4fdead07c9.tar.gz librpm-tizen-466f98a9fb5d0609afa370462e415d4fdead07c9.tar.bz2 librpm-tizen-466f98a9fb5d0609afa370462e415d4fdead07c9.zip | |
Automake portability diddles.
CVS patchset: 3586
CVS date: 2000/02/24 22:28:31
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index f3b9cd3ee..fd117fa15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,19 +14,16 @@ EXTRA_PROGRAMS = rpmconvert # XXX TODO: python perl SUBDIRS = intl po popt build lib misc tools scripts tests doc . -INCLUDES = \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/popt \ +INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ @INCPATH@ -mylibs= $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/popt/libpopt.la \ - @INTLLIBS@ \ - @LIBMISC@ +myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt +# XXX libtool generates dependent libs. +myldadd= $(top_builddir)/build/librpmbuild.la \ + @INTLLIBS@ @LIBMISC@ -LDFLAGS = @LDFLAGS_STATIC@ +LDFLAGS = @LDFLAGS_STATIC@ $(myldflags) +LDADD = $(myldadd) rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,` rpmbin_PROGRAMS = rpm @@ -45,9 +42,8 @@ noinst_HEADERS = \ acconfig.h build.h system.h rpm_SOURCES = build.c rpm.c -rpm_LDADD = $(mylibs) -$(PROGRAMS): $(mylibs) +$(PROGRAMS): $(myldadd) .PHONY: lclint lclint: @@ -56,11 +52,10 @@ lclint: CVSTAG = r$(subst .,-,$(VERSION)) rpm2cpio_SOURCES = rpm2cpio.c -rpm2cpio_LDADD = $(mylibs) rpmconvert_SOURCES = convertdb.c oldrpmdb.c ## Libmisc.a is required for rpmconvert. -rpmconvert_LDADD = $(mylibs) -lgdbm +rpmconvert_LDADD = $(myldadd) -lgdbm install-data-local: @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm |