Make autoreconf work again

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 29cfec5a872a4f18e71a51e084b07aca73779bd7..852844117b301630cc79337c2fa437b34bf8309e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,6 +231,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
        -I $(top_srcdir)/src/libsystemd/sd-network \
        -I $(top_srcdir)/src/libsystemd/sd-hwdb \
+       -I $(top_srcdir)/src/libsystemd/sd-device \
        -I $(top_srcdir)/src/libsystemd-network \
        -I $(top_srcdir)/src/libsystemd-terminal \
        $(OUR_CPPFLAGS)
@@ -843,8 +844,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-polkit-agent.h \
        src/shared/clock-util.c \
        src/shared/clock-util.h \
-       src/shared/time-dst.c \
-       src/shared/time-dst.h \
        src/shared/calendarspec.c \
        src/shared/calendarspec.h \
        src/shared/fileio.c \
@@ -2145,6 +2144,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2346,6 +2346,7 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2381,6 +2382,7 @@ systemd_ac_power_SOURCES = \
 
 systemd_ac_power_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2652,8 +2654,8 @@ systemd_gpt_auto_generator_SOURCES = \
 
 systemd_gpt_auto_generator_LDADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS)
 
@@ -2805,8 +2807,8 @@ systemd_nspawn_CFLAGS = \
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS)
 
@@ -2920,6 +2922,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-path.h \
        src/systemd/sd-network.h \
        src/systemd/sd-hwdb.h \
+       src/systemd/sd-device.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2983,7 +2986,12 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-network/network-util.c \
        src/libsystemd/sd-hwdb/sd-hwdb.c \
        src/libsystemd/sd-hwdb/hwdb-util.h \
-       src/libsystemd/sd-hwdb/hwdb-internal.h
+       src/libsystemd/sd-hwdb/hwdb-intenal.h \
+       src/libsystemd/sd-device/device-internal.h \
+       src/libsystemd/sd-device/device-util.h \
+       src/libsystemd/sd-device/sd-device.c \
+       src/libsystemd/sd-device/device-private.c \
+       src/libsystemd/sd-device/device-private.h
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym
@@ -3596,12 +3604,6 @@ src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIF
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
-SUBDIRS += \
-       docs/libudev
-
-noinst_DATA += \
-       docs/html/libudev \
-       docs/html/gudev
 endif
 
 include_HEADERS += \
@@ -3613,10 +3615,12 @@ lib_LTLIBRARIES += \
 libudev_la_SOURCES =\
        src/libudev/libudev.sym \
        src/libudev/libudev-private.h \
+       src/libudev/libudev-device-internal.h \
        src/libudev/libudev.c \
        src/libudev/libudev-list.c \
        src/libudev/libudev-util.c \
        src/libudev/libudev-device.c \
+       src/libudev/libudev-device-private.c \
        src/libudev/libudev-enumerate.c \
        src/libudev/libudev-monitor.c \
        src/libudev/libudev-queue.c \
@@ -3641,18 +3645,6 @@ pkgconfiglib_DATA += \
 EXTRA_DIST += \
        src/libudev/libudev.pc.in
 
-CLEANFILES += \
-       docs/html/libudev \
-       docs/html/gudev
-
-docs/html/libudev:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_LN)$(LN_S) -f ../libudev/html $@
-
-docs/html/gudev:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_LN)$(LN_S) -f ../gudev/html $@
-
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-hook:
        libname=libudev.so && $(move-to-rootlibdir)
@@ -3668,8 +3660,7 @@ noinst_LTLIBRARIES += \
        libudev-internal.la
 
 libudev_internal_la_SOURCES =\
-       $(libudev_la_SOURCES) \
-       src/libudev/libudev-device-private.c
+       $(libudev_la_SOURCES)
 
 libudev_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -3854,9 +3845,9 @@ systemd_hwdb_SOURCES = \
        src/hwdb/hwdb.c
 
 systemd_hwdb_LDADD = \
+       libudev-internal.la \
        libsystemd-shared.la \
-       libsystemd-internal.la \
-       libudev-internal.la
+       libsystemd-internal.la
 
 rootbin_PROGRAMS += \
        systemd-hwdb
@@ -3966,6 +3957,7 @@ ata_id_SOURCES = \
 
 ata_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -3977,6 +3969,7 @@ cdrom_id_SOURCES = \
 
 cdrom_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -3991,6 +3984,7 @@ collect_SOURCES = \
 
 collect_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4005,6 +3999,7 @@ scsi_id_SOURCES =\
 
 scsi_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4019,6 +4014,7 @@ v4l_id_SOURCES = \
 
 v4l_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4033,6 +4029,7 @@ accelerometer_SOURCES = \
 
 accelerometer_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4044,8 +4041,6 @@ dist_udevrules_DATA += \
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
 if ENABLE_GTK_DOC
-SUBDIRS += \
-       docs/gudev
 endif
 
 libgudev_includedir = \
@@ -4932,6 +4927,7 @@ systemd_backlight_SOURCES = \
 systemd_backlight_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -4952,6 +4948,7 @@ systemd_rfkill_SOURCES = \
 systemd_rfkill_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -4980,6 +4977,7 @@ systemd_cryptsetup_CFLAGS = \
 systemd_cryptsetup_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(LIBCRYPTSETUP_LIBS)
 
@@ -5275,8 +5273,8 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 noinst_LTLIBRARIES += \
@@ -5792,8 +5790,8 @@ networkctl_SOURCES = \
        src/network/networkctl.c
 
 networkctl_LDADD = \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        libsystemd-network.la
 
@@ -5900,8 +5898,8 @@ libsystemd_logind_core_la_SOURCES = \
 
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 if HAVE_ACL
@@ -5924,10 +5922,10 @@ loginctl_SOURCES = \
        src/login/sysfs-show.c
 
 loginctl_LDADD = \
+       libudev-internal.la \
        libsystemd-internal.la \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
-       libudev-internal.la \
        libsystemd-shared.la
 
 rootbin_PROGRAMS += \