From 44768215d390b5e4f792c2a0c2e69c4476d26f9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ralf=20Cors=C3=A9pius?= Date: Wed, 17 Oct 2007 12:13:14 +0200 Subject: [PATCH] Revert yesterday's patch (we're not ready for it). --- Makefile.am | 42 ------------------------------------------ rpmdb/Makefile.am | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5412125..6a69427 100644 --- a/Makefile.am +++ b/Makefile.am @@ -339,45 +339,3 @@ doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt-@VERSION@ rm -rf $@ $(MKDIR_P) $@ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@ - -check_PROGRAMS += tdbi -tdbi_CPPFLAGS = -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir) \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmio \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc \ - @WITH_SQLITE3_INCLUDE@ \ - @WITH_LIBELF_INCLUDE@ -tdbi_SOURCES = rpmdb/tdbi.c -tdbi_LDADD = rpmdb/librpmdb.la - -check_PROGRAMS += tjfn -tjfn_CPPFLAGS = -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir) \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmio \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc \ - @WITH_SQLITE3_INCLUDE@ \ - @WITH_LIBELF_INCLUDE@ -tjfn_SOURCES = rpmdb/tjfn.c -tjfn_LDADD = rpmdb/librpmdb.la @WITH_BEECRYPT_LIB@ - -EXTRA_PROGRAMS = tsql -tsql_SOURCES = rpmdb/tsql.c -tsql_CPPFLAGS = -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir) \ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmio \ - @WITH_BEECRYPT_INCLUDE@ \ - @WITH_POPT_INCLUDE@ \ - -I$(top_srcdir)/misc \ - @WITH_SQLITE3_INCLUDE@ \ - @WITH_LIBELF_INCLUDE@ -tsql_LDADD = rpmdb/librpmdb.la diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index 82b5bc2..31f8160 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = -I. \ @WITH_SQLITE3_INCLUDE@ \ @WITH_LIBELF_INCLUDE@ +check_PROGRAMS = EXTRA_PROGRAMS = CLEANFILES = @@ -174,3 +175,45 @@ rpmdb_verify_LDADD = \ endif CLEANFILES += $(BUILT_SOURCES) + +check_PROGRAMS += tdbi +tdbi_CPPFLAGS = -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ + @WITH_POPT_INCLUDE@ \ + -I$(top_srcdir)/misc \ + @WITH_SQLITE3_INCLUDE@ \ + @WITH_LIBELF_INCLUDE@ +tdbi_SOURCES = $(top_builddir)/rpmdb/tdbi.c +tdbi_LDADD = $(top_builddir)/rpmdb/librpmdb.la + +check_PROGRAMS += tjfn +tjfn_CPPFLAGS = -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ + @WITH_POPT_INCLUDE@ \ + -I$(top_srcdir)/misc \ + @WITH_SQLITE3_INCLUDE@ \ + @WITH_LIBELF_INCLUDE@ +tjfn_SOURCES = $(top_builddir)/rpmdb/tjfn.c +tjfn_LDADD = $(top_builddir)/rpmdb/librpmdb.la @WITH_BEECRYPT_LIB@ + +EXTRA_PROGRAMS += tsql +tsql_SOURCES = $(top_builddir)/rpmdb/tsql.c +tsql_CPPFLAGS = -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ + @WITH_POPT_INCLUDE@ \ + -I$(top_srcdir)/misc \ + @WITH_SQLITE3_INCLUDE@ \ + @WITH_LIBELF_INCLUDE@ +tsql_LDADD = $(top_builddir)/rpmdb/librpmdb.la -- 2.7.4