chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build-sys: avoid duplicate inclusion of log.c in tools
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 540eb80f100b15829958c79d143bd101659583c2..aedd22052ba3ba694d3a7c4288a1327a7852a865 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,12 +173,6 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MEEGO
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-else
 if TARGET_ANGSTROM
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -201,7 +195,6 @@ endif
 endif
 endif
 endif
-endif
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -504,7 +497,9 @@ MANPAGES = \
        man/systemd.preset.5 \
        man/sd-id128.7 \
        man/sd_id128_to_string.3 \
-       man/sd_id128_randomize.3
+       man/sd_id128_randomize.3 \
+       man/sd-journal.7 \
+       man/sd_journal_print.3
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -541,7 +536,10 @@ MANPAGES_ALIAS = \
        man/sd_id128_equal.7 \
        man/sd_id128_from_string.3 \
        man/sd_id128_get_machine.3 \
-       man/sd_id128_get_boot.3
+       man/sd_id128_get_boot.3 \
+       man/sd_journal_printv.3 \
+       man/sd_journal_send.3 \
+       man/sd_journal_sendv.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -578,6 +576,9 @@ man/sd_id128_equal.7: man/sd-id128.7
 man/sd_id128_from_string.3: man/sd_id128_to_string.3
 man/sd_id128_get_machine.3: man/sd_id128_randomize.3
 man/sd_id128_get_boot.3: man/sd_id128_randomize.3
+man/sd_journal_printv.3: man/sd_journal_print.3
+man/sd_journal_send.3: man/sd_journal_print.3
+man/sd_journal_sendv.3: man/sd_journal_print.3
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -724,8 +725,8 @@ libsystemd_logs_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_logs_la_LIBADD = \
-       libsystemd-journal.la \
-       libsystemd-id128.la
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -924,7 +925,7 @@ systemd_CFLAGS = \
 systemd_LDADD = \
        libsystemd-core.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la \
+       libsystemd-id128-internal.la \
        libsystemd-dbus.la
 
 dist_pkgsysconf_DATA += \
@@ -1166,7 +1167,7 @@ systemd_machine_id_setup_SOURCES = \
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
@@ -1291,8 +1292,8 @@ systemctl_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-dbus.la \
        libsystemd-logs.la
 
@@ -2113,12 +2114,15 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la
 
+libsystemd_id128_internal_la_SOURCES = \
+       $(libsystemd_id128_la_SOURCES)
+
 test_id128_SOURCES = \
        src/test/test-id128.c
 
 test_id128_LDADD = \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 noinst_PROGRAMS += \
        test-id128
@@ -2132,6 +2136,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-id128.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-id128-internal.la
+
 pkgconfiglib_DATA += \
        src/libsystemd-id128/libsystemd-id128.pc
 
@@ -2184,11 +2191,11 @@ systemd_journald_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 if ENABLE_LOGIND
 systemd_journald_LDADD += \
-       libsystemd-login.la
+       libsystemd-login-internal.la
 endif
 
 if HAVE_ACL
@@ -2213,15 +2220,15 @@ systemd_cat_SOURCES = \
 
 systemd_cat_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la
+       libsystemd-journal-internal.la
 
 journalctl_SOURCES = \
        src/journal/journalctl.c
 
 journalctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-logs.la
 
 test_journal_SOURCES = \
@@ -2234,7 +2241,7 @@ test_journal_SOURCES = \
 test_journal_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 if HAVE_XZ
 test_journal_SOURCES += \
@@ -2253,7 +2260,8 @@ test_journal_send_SOURCES = \
 
 test_journal_send_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
 
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
@@ -2273,7 +2281,10 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
+
+libsystemd_journal_internal_la_SOURCES = \
+       $(libsystemd_journal_la_SOURCES)
 
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
@@ -2285,6 +2296,14 @@ libsystemd_journal_la_CFLAGS += \
 
 libsystemd_journal_la_LIBADD += \
        $(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS = \
+       $(AM_CFLAGS)
+       $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD = \
+       $(XZ_LIBS)
+
 endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
@@ -2317,6 +2336,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-journal.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-journal-internal.la
+
 rootlibexec_PROGRAMS += \
        systemd-journald
 
@@ -2330,7 +2352,8 @@ dist_systemunit_DATA += \
        units/systemd-journald.socket
 
 nodist_systemunit_DATA += \
-       units/systemd-journald.service
+       units/systemd-journald.service \
+       units/systemd-journal-flush.service
 
 dist_pkgsysconf_DATA += \
        src/journal/journald.conf
@@ -2356,6 +2379,7 @@ EXTRA_DIST += \
        src/journal/libsystemd-journal.pc.in \
        src/journal/libsystemd-journal.sym \
        units/systemd-journald.service.in \
+       units/systemd-journal-flush.service.in \
        src/journal/journald-gperf.gperf
 
 CLEANFILES += \
@@ -2367,13 +2391,13 @@ systemd_coredump_SOURCES = \
        src/journal/coredump.c
 
 systemd_coredump_LDADD = \
-       libsystemd-journal.la \
+       libsystemd-journal-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
 if ENABLE_LOGIND
 systemd_coredump_LDADD += \
-       libsystemd-login.la
+       libsystemd-login-internal.la
 endif
 
 rootlibexec_PROGRAMS += \
@@ -2922,7 +2946,7 @@ test_login_SOURCES = \
        src/login/test-login.c
 
 test_login_LDADD = \
-       libsystemd-login.la \
+       libsystemd-login-internal.la \
        libsystemd-shared.la
 
 test_inhibit_SOURCES = \
@@ -2956,6 +2980,9 @@ libsystemd_login_la_LDFLAGS = \
 libsystemd_login_la_LIBADD = \
        libsystemd-shared.la
 
+libsystemd_login_internal_la_SOURCES = \
+       $(libsystemd_login_la_SOURCES)
+
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
        src/login/pam-module.c
@@ -3023,6 +3050,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-login.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-login-internal.la
+
 pkgconfiglib_DATA += \
        src/login/libsystemd-login.pc
 
@@ -3388,20 +3418,6 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_MEEGO
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f network.target && \
-               $(LN_S) $(systemunitdir)/network.target network.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f * )
-endif
 
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
Unnamed repository; edit this file 'description' to name the repository.