From cdb779d258aafed12733bdab25273307f8b15515 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 9 Aug 2007 11:54:23 +0200 Subject: [PATCH] Bring tests under automake control. --- tools/Makefile.am | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 87709ae..7777d9c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -14,58 +14,61 @@ AM_CPPFLAGS = -I. \ -I$(top_srcdir)/misc \ @INCPATH@ -EXTRA_DIST = rpminject.c rpmsort.c rpmxml.c rpmxp.c rpmxp.h hashtab.h +EXTRA_PROGRAMS = -EXTRA_PROGRAMS = debugedit convertdb1 rpminject rpmsort rpmtool rpmxml - -LDADD = \ - $(top_builddir)/lib/librpm.la +LDADD = ../lib/librpm.la staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@ noinst_PROGRAMS = dumpdb pkgbindir = @RPMCONFIGDIR@ -pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps - -bin_PROGRAMS = rpmgraph +pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ +EXTRA_PROGRAMS += convertdb1 convertdb1_SOURCES = convertdb1.c -debugedit_SOURCES = debugedit.c hashtab.c -debugedit_LDADD = @LDFLAGS_STATIC@ \ - @WITH_LIBELF_LIB@ \ +EXTRA_PROGRAMS += debugedit +debugedit_SOURCES = debugedit.c hashtab.c hashtab.h +# debugedit_LDFLAGS = $(staticLDFLAGS) \ +debugedit_LDFLAGS = @WITH_LIBELF_LIB@ \ @WITH_BEECRYPT_LIB@ \ @WITH_POPT_LIB@ +pkgbin_PROGRAMS += javadeps javadeps_SOURCES = javadeps.c +pkgbin_PROGRAMS += rpmcache rpmcache_SOURCES = rpmcache.c #rpmcache_LDFLAGS = -L$(libdir) # $(staticLDFLAGS) +pkgbin_PROGRAMS += rpmdeps rpmdeps_SOURCES = rpmdeps.c #rpmdeps_LDFLAGS = $(staticLDFLAGS) -rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la +rpmdeps_LDADD = ../build/librpmbuild.la +bin_PROGRAMS = rpmgraph rpmgraph_SOURCES = rpmgraph.c #rpmgraph_LDFLAGS = $(staticLDFLAGS) +EXTRA_PROGRAMS += rpminject rpminject_SOURCES = rpminject.c #rpminject_LDFLAGS = $(staticLDFLAGS) +EXTRA_PROGRAMS += rpmsort rpmsort_SOURCES = rpmsort.c -#rpmsort_LDFLAGS = (staticLDFLAGS) +#rpmsort_LDFLAGS = $(staticLDFLAGS) -rpmtool_SOURCES = rpmtool.c rpmxp.c +EXTRA_PROGRAMS += rpmtool +rpmtool_SOURCES = rpmtool.c rpmxp.c rpmxp.h rpmtool_CFLAGS = -I$(includedir)/libxml2 #rpmtool_LDFLAGS = $(staticLDFLAGS) -rpmtool_LDADD = $(LDADD) -lxml2 +rpmtool_LDADD = ../lib/librpm.la -lxml2 -rpmxml_SOURCES = rpmxml.c # rpmxp.c +EXTRA_PROGRAMS += rpmxml +rpmxml_SOURCES = rpmxml.c rpmxp.h rpmxml_CFLAGS = -I$(includedir)/libxml2 #rpmxml_LDFLAGS = $(staticLDFLAGS) -rpmxml_LDADD = $(LDADD) -lxml2 - -$(PROGRAMS): $(LDADD) +rpmxml_LDADD = ../lib/librpm.la -lxml2 CLEANFILES = $(EXTRA_PROGRAMS) -- 2.7.4