X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=2ed987de6158e19b61e21d33652747aada3af43b;hb=3bb621e1e66b704c0c2dcef31c66f7c646dd47f6;hp=dd9ba96d93267935049617514f96adc910594169;hpb=41fd4c4c15e74a39cecfa5f1764e039c8d88617b;p=elogind.git diff --git a/Makefile.am b/Makefile.am index dd9ba96d9..2ed987de6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -769,7 +769,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/xml.c \ src/shared/xml.h \ src/shared/condition-util.c \ - src/shared/condition-util.h + src/shared/condition-util.h \ + src/shared/bus-label.c \ + src/shared/bus-label.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1392,7 +1394,8 @@ test_cgroup_SOURCES = \ test_cgroup_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c @@ -1455,8 +1458,8 @@ test_install_SOURCES = \ test_install_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la test_watchdog_SOURCES = \ src/test/test-watchdog.c @@ -2328,8 +2331,8 @@ test_bus_introspect_SOURCES = \ src/libsystemd/sd-bus/test-bus-introspect.c test_bus_introspect_LDADD = \ - libsystemd-shared.la \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-shared.la test_event_SOURCES = \ src/libsystemd/sd-event/test-event.c @@ -4321,8 +4324,8 @@ id128_la_LDFLAGS = \ id128_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd.la _daemon_la_SOURCES = \ src/python-systemd/_daemon.c \ @@ -4343,8 +4346,8 @@ _daemon_la_LDFLAGS = \ _daemon_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd.la _reader_la_SOURCES = \ src/python-systemd/_reader.c \ @@ -4364,8 +4367,8 @@ _reader_la_LDFLAGS = \ _reader_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd.la login_la_SOURCES = \ src/python-systemd/login.c \ @@ -4385,8 +4388,8 @@ login_la_LDFLAGS = \ login_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd.la dist_pkgpyexec_PYTHON = \ src/python-systemd/journal.py \ @@ -4432,24 +4435,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) \ @@ -4457,17 +4462,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) \ @@ -4475,14 +4480,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) \ @@ -4490,14 +4497,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) \ @@ -4505,16 +4514,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 \ @@ -4543,7 +4544,6 @@ compat-lib-uninstall-hook: INSTALL_EXEC_HOOKS += compat-lib-install-hook UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook - endif EXTRA_DIST += \ @@ -4972,7 +4972,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' > $@