udev: export udev_device_new_from_device_id()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 49c3e3f2b6294ce36c8f810cdb4cb9d9190d0643..9062dd65dfb9835bdfce7684468841b5b2131d8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,29 +26,29 @@ SUBDIRS = . po
 # 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@
@@ -148,10 +148,11 @@ AM_CPPFLAGS = \
        -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
@@ -386,7 +387,6 @@ EXTRA_DIST += \
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
-       units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -395,7 +395,6 @@ endif
 
 if TARGET_MANDRIVA
 dist_systemunit_DATA += \
-       units/mandriva/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -417,7 +416,6 @@ endif
 
 if TARGET_MAGEIA
 dist_systemunit_DATA += \
-       units/mageia/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -1032,7 +1030,7 @@ BUILT_SOURCES += \
 
 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 $@)
@@ -1400,6 +1398,7 @@ systemd_remount_fs_SOURCES = \
        src/core/mount-setup.h
 
 systemd_remount_fs_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2206,7 +2205,7 @@ dist_udevkeymapforcerel_DATA = \
 
 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 }' < $< > $@
@@ -3461,7 +3460,7 @@ CLEANFILES += \
        ${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)
@@ -3593,15 +3592,12 @@ systemd-install-data-hook:
 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
 
@@ -3619,9 +3615,7 @@ 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)