diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index b4fad0ff39..9b072e8434 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,10 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -#@common.once.head.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +#@build-aux/Makefile.once.head/20-systemd.mk ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory AUTOMAKE_OPTIONS = color-tests parallel-tests @@ -45,7 +48,7 @@ LIBUDEV_CURRENT=7 LIBUDEV_REVISION=4 LIBUDEV_AGE=6 -#@src/libsystemd/src/Makefile +#@src/libsystemd/Makefile LIBSYSTEMD_CURRENT=14 LIBSYSTEMD_REVISION=0 LIBSYSTEMD_AGE=14 @@ -359,40 +362,42 @@ INSTALL_EXEC_HOOKS += \ install-busnames-target-wants-hook #@am-pretty.mk ----------------------------------------------------------------- +V ?= + AM_V_M4 = $(AM_V_M4_$(V)) AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) AM_V_M4_0 = @echo " M4 " $@; -AM_V_M4_1 = +AM_V_M4_1 = AM_V_XSLT = $(AM_V_XSLT_$(V)) AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) AM_V_XSLT_0 = @echo " XSLT " $@; -AM_V_XSLT_1 = +AM_V_XSLT_1 = AM_V_GPERF = $(AM_V_GPERF_$(V)) AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY)) AM_V_GPERF_0 = @echo " GPERF " $@; -AM_V_GPERF_1 = +AM_V_GPERF_1 = AM_V_LN = $(AM_V_LN_$(V)) AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY)) AM_V_LN_0 = @echo " LN " $@; -AM_V_LN_1 = +AM_V_LN_1 = AM_V_RM = $(AM_V_RM_$(V)) AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) AM_V_RM_0 = @echo " RM " $@; -AM_V_RM_1 = +AM_V_RM_1 = AM_V_CC = $(AM_V_CC_$(V)) AM_V_CC_ = $(AM_V_CC_$(AM_DEFAULT_VERBOSITY)) AM_V_CC_0 = @echo " CC " $@; -AM_V_CC_1 = +AM_V_CC_1 = AM_V_CCLD = $(AM_V_CCLD_$(V)) AM_V_CCLD_ = $(AM_V_CCLD_$(AM_DEFAULT_VERBOSITY)) AM_V_CCLD_0 = @echo " CCLD " $@; -AM_V_CCLD_1 = +AM_V_CCLD_1 = AM_V_P = $(AM_V_P_$(V)) AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY)) @@ -402,17 +407,23 @@ AM_V_P_1 = : AM_V_GEN = $(AM_V_GEN_$(V)) AM_V_GEN_ = $(AM_V_GEN_$(AM_DEFAULT_VERBOSITY)) AM_V_GEN_0 = @echo " GEN " $@; -AM_V_GEN_1 = +AM_V_GEN_1 = AM_V_at = $(AM_V_at_$(V)) AM_V_at_ = $(AM_V_at_$(AM_DEFAULT_VERBOSITY)) AM_V_at_0 = @ -AM_V_at_1 = +AM_V_at_1 = AM_V_lt = $(AM_V_lt_$(V)) AM_V_lt_ = $(AM_V_lt_$(AM_DEFAULT_VERBOSITY)) AM_V_lt_0 = --silent -AM_V_lt_1 = +AM_V_lt_1 = + +INTLTOOL_V_MERGE = $(INTLTOOL_V_MERGE_$(V)) +INTLTOOL_V_MERGE_OPTIONS = $(intltool_v_merge_options_$(V)) +INTLTOOL_V_MERGE_ = $(INTLTOOL_V_MERGE_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL_V_MERGE_0 = @echo " ITMRG " $@; +INTLTOOL_V_MERGE_1 = #@discard.mk ------------------------------------------------------------------- rootbin_PROGRAMS = \ @@ -1332,7 +1343,7 @@ EXTRA_DIST += \ CLEANFILES += \ $(gperf_txt_sources) -#@common.once.head.mk +#@build-aux/Makefile.once.head/20-systemd.mk %-from-name.gperf: %-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ @@ -3084,7 +3095,7 @@ systemd_tty_ask_password_agent_SOURCES = \ systemd_tty_ask_password_agent_LDADD = \ libshared.la -#@src/libsystemd/src/Makefile -------------------------------------------------- +#@src/libsystemd/libsystemd-internal/Makefile ---------------------------------- libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ @@ -4267,6 +4278,7 @@ tests += \ test-compress-benchmark endif +#@src/libsystemd/libsystemd-journal-internal/Makefile pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -6358,7 +6370,7 @@ install-tree: all $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree tree $(abs_srcdir)/install-tree -#@common.once.tail.mk +#@build-aux/Makefile.once.tail/20-systemd.mk # Let's run all tests of the test suite, but under valgrind. Let's # exclude perl/python/shell scripts we have in there .PHONY: valgrind-tests @@ -6411,7 +6423,7 @@ check-includes: $(top_srcdir)/tools/check-includes.pl EXTRA_DIST += \ $(top_srcdir)/tools/check-includes.pl -#@common.once.head.mk +#@build-aux/Makefile.once.head/20-systemd.mk # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -6424,7 +6436,7 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -#@src/libsystemd/src/Makefile +#@src/libsystemd/Makefile test-libsystemd-sym.c: \ $(top_builddir)/src/libsystemd/libsystemd.sym \ src/systemd/sd-journal.h \ @@ -6437,19 +6449,19 @@ test-libsystemd-sym.c: \ src/systemd/sd-event.h $(generate-sym-test) -#@src/libudev/src/Makefile +#@src/libudev/Makefile test-libudev-sym.c: \ src/libudev/libudev.sym \ src/udev/udev.h $(generate-sym-test) -#@src/libsystemd/src/Makefile +#@src/libsystemd/Makefile nodist_test_libsystemd_sym_SOURCES = \ test-libsystemd-sym.c test_libsystemd_sym_LDADD = \ libsystemd.la -#@src/libudev/src/Makefile +#@src/libudev/Makefile nodist_test_libudev_sym_SOURCES = \ test-libudev-sym.c test_libudev_sym_CFLAGS = \ @@ -6471,7 +6483,7 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -#@common.once.tail.mk +#@build-aux/Makefile.once.tail/20-systemd.mk .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir) @@ -6491,3 +6503,5 @@ list-keys: add-key: gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import - +#@all +include $(topsrcdir)/build-aux/Makefile.tail.mk |