X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=d9bfc673c9a0ca96b6a1c249c2cd989e47add891;hb=edf906fa2e72b3f33e00a2262962be62e01df9db;hp=3998fedfcd0a3b204f57ec05873e47a6c2458e49;hpb=6f06fff34884e334cd5eab3b371481b4e1039876;p=platform%2Fupstream%2Frpm.git

diff --git a/Makefile.am b/Makefile.am
index 3998fed..d9bfc67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,12 +16,24 @@ SUBDIRS = po misc
 if WITH_INTERNAL_DB
 SUBDIRS += db3
 endif
-if WITH_LUAEXT
+if WITH_LUA
 SUBDIRS += luaext
 endif
-SUBDIRS += rpmio lib build python scripts doc . tests
+SUBDIRS += rpmio lib sign build scripts fileattrs doc .
 
-DIST_SUBDIRS = po misc luaext rpmio lib build python scripts doc tests
+if ENABLE_PYTHON
+SUBDIRS += python
+endif
+
+if ENABLE_PLUGINS
+SUBDIRS += plugins
+endif
+
+if HAVE_FAKECHROOT
+SUBDIRS += tests
+endif
+
+DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs doc tests plugins
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -32,12 +44,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/rpmio
 AM_CPPFLAGS += @WITH_NSS_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
-AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
-AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
-AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
-
-staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\""
 
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
@@ -50,27 +58,32 @@ pkginclude_HEADERS += rpmio/rpmlog.h
 pkginclude_HEADERS += rpmio/rpmpgp.h
 pkginclude_HEADERS += rpmio/rpmsq.h
 pkginclude_HEADERS += rpmio/rpmstring.h
+pkginclude_HEADERS += rpmio/rpmstrpool.h
 pkginclude_HEADERS += rpmio/rpmsw.h
 pkginclude_HEADERS += rpmio/rpmfileutil.h
 pkginclude_HEADERS += rpmio/rpmutil.h
+pkginclude_HEADERS += rpmio/rpmkeyring.h
+pkginclude_HEADERS += rpmio/rpmbase64.h
 
 pkginclude_HEADERS += lib/header.h
 pkginclude_HEADERS += lib/rpmdb.h
 pkginclude_HEADERS += lib/rpmcallback.h
 pkginclude_HEADERS += lib/rpmcli.h
 pkginclude_HEADERS += lib/rpmlib.h
-pkginclude_HEADERS += lib/rpmal.h
 pkginclude_HEADERS += lib/rpmds.h
 pkginclude_HEADERS += lib/rpmfi.h
-pkginclude_HEADERS += lib/rpmgi.h
+pkginclude_HEADERS += lib/rpmlegacy.h
+pkginclude_HEADERS += lib/rpmpol.h
 pkginclude_HEADERS += lib/rpmps.h
+pkginclude_HEADERS += lib/rpmprob.h
 pkginclude_HEADERS += lib/rpmtag.h
 pkginclude_HEADERS += lib/rpmtd.h
 pkginclude_HEADERS += lib/rpmte.h
 pkginclude_HEADERS += lib/rpmts.h
 pkginclude_HEADERS += lib/rpmtypes.h
 pkginclude_HEADERS += lib/rpmvf.h
-nodist_pkginclude_HEADERS += lib/rpmints.h
+
+pkginclude_HEADERS += sign/rpmsign.h
 
 pkginclude_HEADERS += build/rpmbuild.h
 pkginclude_HEADERS += build/rpmfc.h
@@ -80,93 +93,89 @@ pkginclude_HEADERS += build/rpmspec.h
 rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
 
-bin_PROGRAMS =		rpm2cpio rpmbuild
+bin_PROGRAMS =		rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
 
-rpmlibexec_PROGRAMS =	rpmd rpmi rpmk rpmq
-rpmconfig_SCRIPTS =	find-provides find-requires mkinstalldirs \
+rpmlibexec_PROGRAMS =
+rpmconfig_SCRIPTS =	autodeps/find-provides autodeps/find-requires \
+			mkinstalldirs \
 			config.guess config.sub
-DISTCLEANFILES = find-provides
-DISTCLEANFILES += find-requires
+DISTCLEANFILES = autodeps/find-provides
+DISTCLEANFILES += autodeps/find-requires
+
+noinst_LTLIBRARIES = 		libcliutils.la
+libcliutils_la_SOURCES = 	cliutils.h cliutils.c
+libcliutils_la_CPPFLAGS =	$(AM_CPPFLAGS)
+libcliutils_la_LIBADD = 	lib/librpm.la rpmio/librpmio.la
+libcliutils_la_LIBADD +=	@WITH_POPT_LIB@
 
 rpm_SOURCES =		rpmqv.c debug.h system.h
-rpm_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
-rpm_LDADD =		build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpm_LDADD +=		@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmbuild_SOURCES =	build.c rpmqv.c build.h debug.h system.h
-rpmbuild_CPPFLAGS =	$(AM_CPPFLAGS) -DIAM_RPMBT
-rpmbuild_LDADD =	build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpmbuild_LDADD += 	@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmd_SOURCES =		rpmqv.c debug.h system.h
-rpmd_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMDB
-rpmd_LDADD =		lib/librpm.la rpmio/librpmio.la
-rpmd_LDADD +=		@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmi_SOURCES =		rpmqv.c debug.h system.h
-rpmi_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMEIU
-rpmi_LDADD =		lib/librpm.la rpmio/librpmio.la
-rpmi_LDADD +=		@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmk_SOURCES =		rpmqv.c debug.h system.h
-rpmk_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMK
-rpmk_LDADD =		lib/librpm.la rpmio/librpmio.la
-rpmk_LDADD +=		@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmq_SOURCES =		rpmqv.c debug.h system.h
-rpmq_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMQV
-rpmq_LDADD =		build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpmq_LDADD +=		@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+rpm_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMEIU -DIAM_RPMQ -DIAM_RPMV
+rpm_LDADD =		libcliutils.la
+rpm_LDADD +=		lib/librpm.la rpmio/librpmio.la
+rpm_LDADD +=		@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
+rpmdb_SOURCES =		rpmdb.c debug.h system.h
+rpmdb_CPPFLAGS =	$(AM_CPPFLAGS)
+rpmdb_LDADD =		libcliutils.la
+rpmdb_LDADD +=		lib/librpm.la rpmio/librpmio.la
+rpmdb_LDADD +=		@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
+rpmkeys_SOURCES =	rpmkeys.c debug.h system.h
+rpmkeys_CPPFLAGS =	$(AM_CPPFLAGS)
+rpmkeys_LDADD =		libcliutils.la
+rpmkeys_LDADD +=	lib/librpm.la rpmio/librpmio.la
+rpmkeys_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
+rpmsign_SOURCES =	rpmsign.c debug.h system.h
+rpmsign_CPPFLAGS =	$(AM_CPPFLAGS)
+rpmsign_LDADD =		libcliutils.la
+rpmsign_LDADD +=	sign/librpmsign.la lib/librpm.la rpmio/librpmio.la
+rpmsign_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
+rpmbuild_SOURCES =	rpmbuild.c debug.h system.h
+rpmbuild_CPPFLAGS =	$(AM_CPPFLAGS)
+rpmbuild_LDADD =	libcliutils.la
+rpmbuild_LDADD +=	build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
+rpmbuild_LDADD += 	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+
+rpmspec_SOURCES =	rpmspec.c debug.h system.h
+rpmspec_CPPFLAGS =	$(AM_CPPFLAGS)
+rpmspec_LDADD =		libcliutils.la
+rpmspec_LDADD +=	build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
+rpmspec_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
 rpm2cpio_SOURCES =	rpm2cpio.c debug.h system.h
 rpm2cpio_LDADD =	lib/librpm.la rpmio/librpmio.la
-rpm2cpio_LDADD +=	@WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
+rpm2cpio_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
 
 if LIBELF
-if LIBDWARF
 rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
 
 rpmlibexec_PROGRAMS +=	debugedit
 debugedit_SOURCES =	tools/debugedit.c tools/hashtab.c tools/hashtab.h
 debugedit_LDADD =	rpmio/librpmio.la
 debugedit_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
-endif
-endif
-
-rpmlibexec_PROGRAMS +=	javadeps
-javadeps_SOURCES =	tools/javadeps.c
-javadeps_LDADD =
 
-rpmlibexec_PROGRAMS +=	rpmcache
-rpmcache_SOURCES =	tools/rpmcache.c
-rpmcache_LDADD =	lib/librpm.la
+rpmlibexec_PROGRAMS +=	elfdeps
+elfdeps_SOURCES =	tools/elfdeps.c
+elfdeps_LDADD =		rpmio/librpmio.la
+elfdeps_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
+endif
 
 rpmlibexec_PROGRAMS +=	rpmdeps
 rpmdeps_SOURCES =	tools/rpmdeps.c
-rpmdeps_LDADD =		build/librpmbuild.la
+rpmdeps_LDADD =		lib/librpm.la rpmio/librpmio.la build/librpmbuild.la @WITH_POPT_LIB@
 
 bin_PROGRAMS +=		rpmgraph
 rpmgraph_SOURCES =	tools/rpmgraph.c
-rpmgraph_LDADD =	lib/librpm.la
+rpmgraph_LDADD =	lib/librpm.la rpmio/librpmio.la @WITH_POPT_LIB@
 
 dist_bin_SCRIPTS =	scripts/gendiff
 
-check_PROGRAMS = 	dumpdb
-dumpdb_SOURCES = 	tools/dumpdb.c
-dumpdb_LDADD =		lib/librpm.la
-
-check_PROGRAMS +=	convertdb1
-convertdb1_SOURCES =	tools/convertdb1.c
-convertdb1_LDADD =	lib/librpm.la
-
-check_PROGRAMS +=	rpminject
-rpminject_SOURCES =	tools/rpminject.c
-rpminject_LDADD =	build/librpmbuild.la
-
-check_PROGRAMS +=	rpmsort
-rpmsort_SOURCES =	tools/rpmsort.c
-rpmsort_LDADD =		lib/librpm.la
+bin_PROGRAMS +=		rpmqpack
+rpmqpack_SOURCES =      rpmqpack.c
+rpmqpack_LDADD =        lib/librpm.la
 
 rpmconfig_DATA = rpmrc
 rpmrc: $(top_srcdir)/rpmrc.in
@@ -179,11 +188,8 @@ EXTRA_DIST += rpmrc.in
 
 rpmconfig_DATA += macros
 macros: $(top_srcdir)/macros.in
-	@$(SED) \
-	  -e "s,[@]varprefix[@],$(localstatedir),g" \
-	  < $(top_srcdir)/macros.in > macros.tmp \
-	  && ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.tmp )
-CLEANFILES += macros.tmp macros
+	  ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.in )
+CLEANFILES += macros
 EXTRA_DIST += macros.in
 
 noinst_DATA = platform
@@ -208,6 +214,7 @@ rpmconfig_DATA += rpmpopt-$(VERSION)
 rpmpopt-@VERSION@: $(top_srcdir)/rpmpopt.in
 	@$(SED) \
 	  -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
+	  -e "s,[@]BINDIR[@],$(bindir),g" \
 	  < $(top_srcdir)/rpmpopt.in > rpmpopt-@VERSION@.tmp \
 	  && ( cd $(top_builddir) && ./config.status --file=${subdir}/rpmpopt-@VERSION@:${subdir}/rpmpopt-@VERSION@.tmp )
 CLEANFILES += rpmpopt-@VERSION@.tmp rpmpopt-@VERSION@
@@ -219,45 +226,23 @@ rpmvardir = $(localstatedir)/lib/rpm
 rpmvar_DATA =
 
 install-exec-hook:
-	@rm -f $(DESTDIR)$(rpmlibexecdir)/rpme
-	@@LN_S@ rpmi $(DESTDIR)$(rpmlibexecdir)/rpme
-	@rm -f $(DESTDIR)$(rpmlibexecdir)/rpmu
-	@@LN_S@ rpmi $(DESTDIR)$(rpmlibexecdir)/rpmu
-	@rm -f $(DESTDIR)$(rpmlibexecdir)/rpmv
-	@@LN_S@ rpmq $(DESTDIR)$(rpmlibexecdir)/rpmv
-	rm -f $(DESTDIR)$(bindir)/rpmquery
-	@LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
-	rm -f $(DESTDIR)$(bindir)/rpmverify
-	@LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
-	rm -f $(DESTDIR)$(bindir)/rpmsign
-	@LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
-	rm -f $(DESTDIR)$(bindir)/rpmdb ; \
-	@LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
-	for bf in e i u ; do \
-	    rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
-	    @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
-	done
+	@rm -f $(DESTDIR)$(bindir)/rpmquery
+	@LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmquery
+	@rm -f $(DESTDIR)$(bindir)/rpmverify
+	@LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmverify
 
 install-data-local:
-	@case "@host_os@" in \
-	solaris*|linux*|darwin*) \
-	   DESTDIR="$(DESTDIR)" pkglibdir="$(rpmconfigdir)" $(SHELL) $(top_srcdir)/installplatform rpmrc macros platform ;; \
-	esac
+	DESTDIR="$(DESTDIR)" pkglibdir="$(rpmconfigdir)" \
+		$(SHELL) $(top_srcdir)/installplatform \
+			rpmrc platform \
+			$(RPMCANONVENDOR) $(RPMCANONOS) $(RPMCANONGNU)
 	@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp
 
 # XXX to appease distcheck we need to remove "stuff" here...
 uninstall-local:
-	@rm -rf $(DESTDIR)/$(rpmconfigdir)/platform
-	@rm -f $(DESTDIR)$(rpmlibexecdir)/rpmu
-	@rm -f $(DESTDIR)$(rpmlibexecdir)/rpme
-	@rm -f $(DESTDIR)$(rpmlibexecdir)/rpmv
 	@rm -f $(DESTDIR)$(bindir)/rpmquery
-	@rm -f $(DESTDIR)$(bindir)/rpmu
-	@rm -f $(DESTDIR)$(bindir)/rpmsign
-	@rm -f $(DESTDIR)$(bindir)/rpme
 	@rm -f $(DESTDIR)$(bindir)/rpmverify
-	@rm -f $(DESTDIR)$(bindir)/rpmdb
-	@rm -f $(DESTDIR)$(bindir)/rpmi
+	@rm -rf $(DESTDIR)$(rpmconfigdir)/platform/
 
 MAINTAINERCLEANFILES = ChangeLog