X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=feadc9821d8be7b0c3d2802ec159d078695d512e;hb=d8148cc59d0faa44d26fe27f91eb177334b4e08b;hp=069971268609eb21878262712ed3e466405e0266;hpb=0031ccd3060593f8c411e76a7764dffe8326f21f;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 069971268..feadc9821 100644 --- a/Makefile.am +++ b/Makefile.am @@ -775,6 +775,10 @@ nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h +libsystemd_shared_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-units.la @@ -817,7 +821,6 @@ libsystemd_label_la_LIBADD = \ # ------------------------------------------------------------------------------ if HAVE_SECCOMP - noinst_LTLIBRARIES += \ libsystemd-seccomp.la @@ -831,7 +834,6 @@ libsystemd_seccomp_la_CFLAGS = \ libsystemd_seccomp_la_LIBADD = \ $(SECCOMP_LIBS) - endif # ------------------------------------------------------------------------------ @@ -1081,6 +1083,10 @@ src/shared/errno-to-name.h: src/shared/errno-list.txt systemd_SOURCES = \ src/core/main.c +systemd_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + systemd_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1178,6 +1184,10 @@ test_device_nodes_LDADD = \ test_engine_SOURCES = \ src/test/test-engine.c +test_engine_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_engine_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1185,6 +1195,10 @@ test_engine_LDADD = \ test_job_type_SOURCES = \ src/test/test-job-type.c +test_job_type_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_job_type_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1192,6 +1206,10 @@ test_job_type_LDADD = \ test_ns_SOURCES = \ src/test/test-ns.c +test_ns_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_ns_LDADD = \ libsystemd-core.la @@ -1221,6 +1239,10 @@ endif test_unit_name_SOURCES = \ src/test/test-unit-name.c +test_unit_name_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_unit_name_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1228,6 +1250,10 @@ test_unit_name_LDADD = \ test_unit_file_SOURCES = \ src/test/test-unit-file.c +test_unit_file_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_unit_file_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1278,6 +1304,10 @@ test_tables_SOURCES = \ src/test/test-tables.c \ src/shared/test-tables.h +test_tables_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_tables_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ @@ -1371,6 +1401,10 @@ test_cgroup_mask_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" +test_cgroup_mask_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_cgroup_mask_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1437,6 +1471,10 @@ test_sched_prio_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" +test_sched_prio_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_sched_prio_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -2164,6 +2202,10 @@ test_bus_chat_LDADD = \ test_bus_cleanup_SOURCES = \ src/libsystemd/sd-bus/test-bus-cleanup.c +test_bus_cleanup_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_bus_cleanup_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la @@ -2464,7 +2506,8 @@ INSTALL_DIRS += \ $(sysconfdir)/udev/hwdb.d dist_network_DATA = \ - network/99-default.link + network/99-default.link \ + network/80-container-host0.network dist_udevrules_DATA += \ rules/99-systemd.rules \ @@ -4389,24 +4432,26 @@ clean-python: # ------------------------------------------------------------------------------ if ENABLE_COMPAT_LIBS - EXTRA_DIST += \ src/compat-libs/linkwarning.h -define generate-fake-lib +libsystemd-%.c: src/compat-libs/libsystemd-%.sym $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@ -endef + $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@ + +BUILT_SOURCES += \ + libsystemd-journal.c \ + libsystemd-login.c \ + libsystemd-id128.c \ + libsystemd-daemon.c libsystemd_journal_la_SOURCES = \ libsystemd-journal.c \ src/compat-libs/libsystemd-journal.sym -libsystemd_journal_la_CFLAGS = \ +libsystemd_journal_la_CPPFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ - -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \ - -fno-lto + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h libsystemd_journal_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4414,17 +4459,17 @@ libsystemd_journal_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym libsystemd_journal_la_LIBADD = \ - libsystemd.la + libsystemd-journal-internal.la \ + libsystemd-internal.la \ + libsystemd-shared.la libsystemd_login_la_SOURCES = \ libsystemd-login.c \ src/compat-libs/libsystemd-login.sym -libsystemd_login_la_CFLAGS = \ +libsystemd_login_la_CPPFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ - -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \ - -fno-lto + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h libsystemd_login_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4432,14 +4477,16 @@ libsystemd_login_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym libsystemd_login_la_LIBADD = \ - libsystemd.la + libsystemd-internal.la \ + libsystemd-shared.la libsystemd_id128_la_SOURCES = \ libsystemd-id128.c \ src/compat-libs/libsystemd-id128.sym -libsystemd_id128_la_CFLAGS = \ - $(libsystemd_login_la_CFLAGS) +libsystemd_id128_la_CPPFLAGS = \ + $(AM_CFLAGS) \ + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h libsystemd_id128_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4447,14 +4494,16 @@ libsystemd_id128_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libsystemd.la + libsystemd-internal.la \ + libsystemd-shared.la libsystemd_daemon_la_SOURCES = \ libsystemd-daemon.c \ src/compat-libs/libsystemd-daemon.sym -libsystemd_daemon_la_CFLAGS = \ - $(libsystemd_login_la_CFLAGS) +libsystemd_daemon_la_CPPFLAGS = \ + $(AM_CFLAGS) \ + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h libsystemd_daemon_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4462,16 +4511,8 @@ libsystemd_daemon_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym libsystemd_daemon_la_LIBADD = \ - libsystemd.la - -BUILT_SOURCES += \ - libsystemd-journal.c \ - libsystemd-login.c \ - libsystemd-id128.c \ - libsystemd-daemon.c - -libsystemd-%.c: src/compat-libs/libsystemd-%.sym - $(generate-fake-lib) + libsystemd-internal.la \ + libsystemd-shared.la lib_LTLIBRARIES += \ libsystemd-journal.la \ @@ -4500,7 +4541,6 @@ compat-lib-uninstall-hook: INSTALL_EXEC_HOOKS += compat-lib-install-hook UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook - endif EXTRA_DIST += \ @@ -4929,7 +4969,6 @@ EXTRA_DIST += \ $(top_srcdir)/tools/check-includes.pl # Stupid test that everything purported to be exported really is - define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_at)printf '#include \n' > $@