# remove targets if the command fails
.DELETE_ON_ERROR:
-LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=0
+LIBUDEV_CURRENT=2
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=2
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=3
+LIBSYSTEMD_DAEMON_REVISION=4
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=7
+LIBSYSTEMD_ID128_REVISION=8
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=3
+LIBSYSTEMD_JOURNAL_CURRENT=4
LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=3
+LIBSYSTEMD_JOURNAL_AGE=4
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
-I $(top_builddir)/src/core \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/udev \
+ $(OUR_CPPFLAGS)
-AM_CFLAGS = $(WARNINGFLAGS)
-AM_LDFLAGS = $(GCLDFLAGS)
+AM_CFLAGS = $(OUR_CFLAGS)
+AM_LDFLAGS = $(OUR_LDFLAGS)
# ------------------------------------------------------------------------------
if TARGET_GENTOO
if TARGET_FEDORA
dist_systemunit_DATA += \
- units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
if TARGET_MANDRIVA
dist_systemunit_DATA += \
- units/mandriva/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
if TARGET_MAGEIA
dist_systemunit_DATA += \
- units/mageia/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
man/sd_journal_printv.3 \
man/sd_journal_send.3 \
man/sd_journal_sendv.3 \
+ man/sd_journal_perror.3 \
man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
man/sd_journal_open_directory.3 \
man/sd_journal_close.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
+man/sd_journal_perror.3: man/sd_journal_print.3
man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
man/sd_journal_open_directory.3: man/sd_journal_open.3
man/sd_journal_close.3: man/sd_journal_open.3
src/core/syscall-list.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/core/mount-setup.h
systemd_remount_fs_LDADD = \
+ libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-journal-internal.la \
- libsystemd-id128-internal.la \
libsystemd-dbus.la \
libsystemd-logs.la
--warn-all
src_gudev_GUdev_1_0_gir_FILES = \
- $(top_srcdir)/src/gudev/gudev.h \
- $(top_srcdir)/src/gudev/gudevtypes.h \
- $(top_srcdir)/src/gudev/gudevenums.h \
- $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
- $(top_srcdir)/src/gudev/gudevclient.h \
- $(top_srcdir)/src/gudev/gudevdevice.h \
- $(top_srcdir)/src/gudev/gudevenumerator.h \
- $(top_srcdir)/src/gudev/gudevclient.c \
- $(top_srcdir)/src/gudev/gudevdevice.c \
- $(top_srcdir)/src/gudev/gudevenumerator.c
+ src/gudev/gudev.h \
+ src/gudev/gudevtypes.h \
+ src/gudev/gudevenums.h \
+ src/gudev/gudevenumtypes.h \
+ src/gudev/gudevclient.h \
+ src/gudev/gudevdevice.h \
+ src/gudev/gudevenumerator.h \
+ src/gudev/gudevclient.c \
+ src/gudev/gudevdevice.c \
+ src/gudev/gudevenumerator.c
INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
keymaps/module-sony \
keymaps/module-sony-old \
keymaps/module-sony-vgn \
+ keymaps/module-sony-vpc \
keymaps/olpc-xo \
keymaps/onkyo \
keymaps/oqo-model2 \
src/udev/keymap/keys.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/journald.h \
- src/journal/sd-journal.c \
- src/journal/journal-file.c \
- src/journal/journal-file.h \
- src/journal/lookup3.c \
- src/journal/lookup3.h \
- src/journal/journal-rate-limit.c \
- src/journal/journal-rate-limit.h \
- src/journal/sparse-endian.h \
- src/journal/journal-def.h \
- src/journal/journal-internal.h \
- src/journal/compress.h
+ src/journal/journald-kmsg.c \
+ src/journal/journald-kmsg.h \
+ src/journal/journald-syslog.c \
+ src/journal/journald-syslog.h \
+ src/journal/journald-stream.c \
+ src/journal/journald-stream.h \
+ src/journal/journald-console.c \
+ src/journal/journald-console.h \
+ src/journal/journald-native.c \
+ src/journal/journald-native.h \
+ src/journal/journald-rate-limit.c \
+ src/journal/journald-rate-limit.h \
+ src/journal/journal-internal.h
nodist_systemd_journald_SOURCES = \
src/journal/journald-gperf.c
-systemd_journald_CFLAGS =
-
systemd_journald_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-journal-internal.la \
+ libudev.la
if ENABLE_LOGIND
systemd_journald_LDADD += \
libsystemd-acl.la
endif
-if HAVE_XZ
-systemd_journald_SOURCES += \
- src/journal/compress.c
-
-systemd_journald_CFLAGS += \
- $(AM_CFLAGS) \
- $(XZ_CFLAGS)
-
-systemd_journald_LDADD += \
- $(XZ_LIBS)
-endif
-
systemd_cat_SOURCES = \
src/journal/cat.c
journalctl_SOURCES = \
src/journal/journalctl.c
+journalctl_CFLAGS = \
+ $(AM_CFLAGS)
+
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-logs.la
+if HAVE_QRENCODE
+journalctl_SOURCES += \
+ src/journal/journal-qrcode.c \
+ src/journal/journal-qrcode.h
+
+journalctl_CFLAGS += \
+ $(QRENCODE_CFLAGS)
+
+journalctl_LDADD += \
+ $(QRENCODE_LIBS)
+endif
+
test_journal_SOURCES = \
src/journal/test-journal.c
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_verify_SOURCES = \
+ src/journal/test-journal-verify.c
+
+test_journal_verify_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
+ src/systemd/sd-journal.h \
src/journal/journal-file.c \
+ src/journal/journal-file.h \
+ src/journal/journal-vacuum.c \
+ src/journal/journal-vacuum.h \
+ src/journal/journal-verify.c \
+ src/journal/journal-verify.h \
src/journal/lookup3.c \
- src/journal/journal-send.c
+ src/journal/lookup3.h \
+ src/journal/journal-send.c \
+ src/journal/sparse-endian.h \
+ src/journal/journal-def.h \
+ src/journal/compress.h \
+ src/journal/mmap-cache.c \
+ src/journal/mmap-cache.h
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_journal_internal_la_SOURCES = \
$(libsystemd_journal_la_SOURCES)
+libsystemd_journal_internal_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
src/journal/compress.c
libsystemd_journal_la_CFLAGS += \
- $(AM_CFLAGS) \
$(XZ_CFLAGS)
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
-libsystemd_journal_internal_la_CFLAGS = \
- $(AM_CFLAGS)
+libsystemd_journal_internal_la_CFLAGS += \
$(XZ_CFLAGS)
-libsystemd_journal_internal_la_LIBADD = \
+libsystemd_journal_internal_la_LIBADD += \
$(XZ_LIBS)
endif
+if HAVE_GCRYPT
+libsystemd_journal_la_SOURCES += \
+ src/journal/journal-authenticate.c \
+ src/journal/journal-authenticate.h \
+ src/journal/fsprg.c \
+ src/journal/fsprg.h
+
+libsystemd_journal_la_CFLAGS += \
+ $(GCRYPT_CFLAGS) \
+ -Wno-pointer-arith
+
+libsystemd_journal_la_LIBADD += \
+ $(GCRYPT_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS += \
+ $(GCRYPT_CFLAGS) \
+ -Wno-pointer-arith
+
+libsystemd_journal_internal_la_LIBADD += \
+ $(GCRYPT_LIBS)
+endif
+
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
test-journal \
test-journal-send \
test-journal-match \
- test-journal-stream
+ test-journal-stream \
+ test-journal-verify
TESTS += \
test-journal \
test-journal-match \
- test-journal-stream
+ test-journal-stream \
+ test-journal-verify
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
timedated-install-data-hook:
$(MKDIR_P) -m 0755 \
- $(DESTDIR)$(prefix)/lib/ntp-units.d \
- $(DESTDIR)$(sysconfdir)/ntp-units.d
+ $(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \
+ $(DESTDIR)$(sysconfdir)/systemd/ntp-units.d
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.timedate1.service && \
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
${XML_FILES:.xml=.html}
endif
-DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
CLEANFILES += \
$(dbusinterface_DATA)
if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service single.service && \
- $(LN_S) prefdm.service display-manager.service && \
$(LN_S) rescue.service single.service )
endif
if TARGET_MANDRIVA
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service dm.service single.service && \
- $(LN_S) prefdm.service display-manager.service && \
- $(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
endif
if TARGET_MAGEIA
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service && \
- $(LN_S) prefdm.service display-manager.service && \
- $(LN_S) prefdm.service dm.service )
+ rm -f display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)