From 475de38e3b15415ed88e9a7969a468517a4a420d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 6 Jun 2016 20:35:31 -0400 Subject: oops --- build-aux/Makefile.each.tail/20-systemd.mk | 4 ++-- build-aux/Makefile.once.head/20-systemd.mk | 2 ++ src/libsystemd/Makefile | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk index 40fc6d8baf..5047f895ab 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-systemd.mk @@ -59,8 +59,8 @@ $(outdir)/%-from-name.h: $(outdir)/%-from-name.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ -#$(outdir)/%: $(srcdir)/%.in -# $(SED_PROCESS) +$(addprefix $(outdir)/,$(systemd.sed_files)): $(outdir)/%: $(srcdir)/%.in + $(SED_PROCESS) #$(outdir)/%.sh: $(srcdir)/%.sh.in # $(SED_PROCESS) diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 4b4c1b6187..63d54ba07e 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -191,6 +191,8 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef +at.dirlocal += systemd.sed_files + at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES at.dirlocal += bin_PROGRAMS at.dirlocal += pkgconfiglib_DATA diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index dcf7cbd798..203db9f4aa 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -131,5 +131,6 @@ $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym $(outdir)/libsystemd.la: $(outdir)/libsystemd-internal/libsystemd-internal.la $(outdir)/libsystemd.la: $(outdir)/libsystemd-journal-internal/libsystemd-journal-internal.la at.subdirs += libsystemd-internal libsystemd-journal-internal +systemd.sed_files += libsystemd.pc #at.subdirs += compat-libs include $(topsrcdir)/build-aux/Makefile.tail.mk -- cgit v1.2.3-54-g00ecf