From 5fc914c34c9190c28fd44a3904ee939594ebd26b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 26 Feb 2014 09:41:41 -0500 Subject: [PATCH] build: Update for move of relabeling helper to autobuilder code --- Makefile-autobuilder.am | 6 ++++++ Makefile-rpm-ostree.am | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile-autobuilder.am b/Makefile-autobuilder.am index fbb8a55b..ae891cb7 100644 --- a/Makefile-autobuilder.am +++ b/Makefile-autobuilder.am @@ -26,6 +26,12 @@ rpm-ostree-autobuilder: src/autobuilder/rpm-ostree-autobuilder.in Makefile sed $(substitutions) $< > $@.tmp && mv $@.tmp $@ EXTRA_DIST += src/autobuilder/rpm-ostree-autobuilder.in +autobuilder_privlibdir=$(libdir)/$(PACKAGE)-autobuilder +autobuilder_privlib_PROGRAMS = rpm-ostree-relabeling-helper +rpm_ostree_relabeling_helper_SOURCES = src/rpm-ostree-relabeling-helper.c +rpm_ostree_relabeling_helper_CFLAGS = $(AM_CFLAGS) $(PKGDEP_RPMOSTREE_CFLAGS) +rpm_ostree_relabeling_helper_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) + bin_SCRIPTS += rpm-ostree-autobuilder \ $(NULL) diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am index 0a8bfa24..89f692ec 100644 --- a/Makefile-rpm-ostree.am +++ b/Makefile-rpm-ostree.am @@ -17,11 +17,6 @@ privlib_SCRIPTS = src/rpmqa-sorted src/repoquery-sorted -privlib_PROGRAMS = rpm-ostree-relabeling-helper -rpm_ostree_relabeling_helper_SOURCES = src/rpm-ostree-relabeling-helper.c -rpm_ostree_relabeling_helper_CFLAGS = $(AM_CFLAGS) $(PKGDEP_RPMOSTREE_CFLAGS) -rpm_ostree_relabeling_helper_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) - bin_PROGRAMS += rpm-ostree rpm_ostree_SOURCES = src/rpm-ostree.c \