diff options
| author | Ralf Corsépius <corsepiu@fedoraproject.org> | 2007-08-13 12:30:58 +0200 |
|---|---|---|
| committer | Ralf Corsépius <corsepiu@fedoraproject.org> | 2007-08-13 12:30:58 +0200 |
| commit | bff16e3474f6eb4ca0bef1d9290ea0d9a7b80684 (patch) | |
| tree | 4c0d1b3abd42fe29d389733caf9445ba7581c421 | |
| parent | 8aeb0c33dd7c0964731e2bd9ce969a65c246ec70 (diff) | |
| download | librpm-tizen-bff16e3474f6eb4ca0bef1d9290ea0d9a7b80684.tar.gz librpm-tizen-bff16e3474f6eb4ca0bef1d9290ea0d9a7b80684.tar.bz2 librpm-tizen-bff16e3474f6eb4ca0bef1d9290ea0d9a7b80684.zip | |
Reformat.
Comment out static ldflags.
Replace refs to $(top_builddir)/popt/libpopt.la with @WITH_POPT_LIB@.
| -rw-r--r-- | rpmio/Makefile.am | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index f81443a90..da3f263d0 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -2,10 +2,6 @@ LINT = splint -EXTRA_DIST = tax.c tdigest.c tdir.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c trpmio.c - -EXTRA_PROGRAMS = tax tdigest tdir tfts tget thkp tput tglob tinv tkey tring trpmio tsw - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ @WITH_BEECRYPT_INCLUDE@ \ @@ -54,52 +50,66 @@ sources: lint: $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) +EXTRA_PROGRAMS = + +EXTRA_PROGRAMS += tax tax_SOURCES = tax.c tax_LDADD = librpmio.la +EXTRA_PROGRAMS += tdigest tdigest_SOURCES = tdigest.c -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt +tdigest_LDADD = librpmio.la @WITH_POPT_LIB@ -lgcrypt +EXTRA_PROGRAMS += tdir tdir_SOURCES = tdir.c -tdir_LDFLAGS = @LDFLAGS_STATIC@ -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tdir_LDFLAGS = @LDFLAGS_STATIC@ +tdir_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tfts tfts_SOURCES = tfts.c -tfts_LDFLAGS = @LDFLAGS_STATIC@ -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tfts_LDFLAGS = @LDFLAGS_STATIC@ +tfts_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tget tget_SOURCES = tget.c -tget_LDFLAGS = @LDFLAGS_STATIC@ -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tget_LDFLAGS = @LDFLAGS_STATIC@ +tget_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += thkp thkp_SOURCES = thkp.c -thkp_LDFLAGS = @LDFLAGS_STATIC@ -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# thkp_LDFLAGS = @LDFLAGS_STATIC@ +thkp_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tput tput_SOURCES = tput.c -tput_LDFLAGS = @LDFLAGS_STATIC@ -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tput_LDFLAGS = @LDFLAGS_STATIC@ +tput_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tglob tglob_SOURCES = tglob.c -tglob_LDFLAGS = @LDFLAGS_STATIC@ -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tglob_LDFLAGS = @LDFLAGS_STATIC@ +tglob_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tinv tinv_SOURCES = tinv.c -tinv_LDFLAGS = @LDFLAGS_STATIC@ -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tinv_LDFLAGS = @LDFLAGS_STATIC@ +tinv_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tkey tkey_SOURCES = tkey.c -tkey_LDFLAGS = @LDFLAGS_STATIC@ -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tkey_LDFLAGS = @LDFLAGS_STATIC@ +tkey_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tring tring_SOURCES = tring.c -tring_LDFLAGS = @LDFLAGS_STATIC@ -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +# tring_LDFLAGS = @LDFLAGS_STATIC@ +tring_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += trpmio trpmio_SOURCES = trpmio.c -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = librpmio.la @WITH_POPT_LIB@ +EXTRA_PROGRAMS += tsw tsw_SOURCES = tsw.c tsw_LDFLAGS = librpmio.la - |