X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8f68a1005932ef8536704324824b479cde8efa40;hp=165b85deae79a3880811126e1f0774ca6d860946;hb=bc2708414babc5c99bb8000e63c84e87606cc15d;hpb=f934051c4d17d167bd8e46dd3c70a745e26fd2eb

diff --git a/Makefile.am b/Makefile.am
index 165b85dea..8f68a1005 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,47 +167,6 @@ AM_CPPFLAGS = \
 AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
-# ------------------------------------------------------------------------------
-if TARGET_GENTOO
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_ARCH
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_FRUGALWARE
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MANDRIVA
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\"
-else
-if TARGET_ANGSTROM
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MAGEIA
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\"
-else
-AM_CPPFLAGS += \
-	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\"
-endif
-endif
-endif
-endif
-endif
-endif
-
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
 	systemctl \
@@ -406,34 +365,15 @@ EXTRA_DIST += \
 	units/systemd-modules-load.service.in
 endif
 
-if TARGET_FEDORA
-dist_systemunit_DATA += \
-	units/fedora/rc-local.service \
-	units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-	systemd-rc-local-generator
-endif
-
-if TARGET_MANDRIVA
-dist_systemunit_DATA += \
-	units/fedora/rc-local.service \
-	units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-	systemd-rc-local-generator
-endif
+if HAVE_SYSV_COMPAT
+nodist_systemunit_DATA += \
+	units/rc-local.service \
+	units/halt-local.service
 
-if TARGET_SUSE
-dist_systemunit_DATA += \
-	units/suse/rc-local.service \
-	units/suse/halt-local.service
-systemgenerator_PROGRAMS += \
-	systemd-rc-local-generator
-endif
+EXTRA_DIST += \
+	units/rc-local.service.in \
+	units/halt-local.service.in
 
-if TARGET_MAGEIA
-dist_systemunit_DATA += \
-	units/fedora/rc-local.service \
-	units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
 	systemd-rc-local-generator
 endif
@@ -849,6 +789,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/calendarspec.c \
 	src/shared/calendarspec.h
 
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-dbus.la
@@ -1903,6 +1845,7 @@ dist_udevhwdb_DATA = \
 	hwdb/20-pci-classes.hwdb \
 	hwdb/20-usb-vendor-product.hwdb \
 	hwdb/20-usb-classes.hwdb \
+	hwdb/20-bluetooth-vendor-product.hwdb \
 	hwdb/20-acpi-vendor.hwdb \
 	hwdb/20-OUI.hwdb
 
@@ -3479,6 +3422,8 @@ systemd_logind_SOURCES = \
 	src/login/logind-device.h \
 	src/login/logind-button.c \
 	src/login/logind-button.h \
+	src/login/logind-action.c \
+	src/login/logind-action.h \
 	src/login/logind-seat.c \
 	src/login/logind-seat.h \
 	src/login/logind-session.c \
@@ -3851,6 +3796,8 @@ SED_PROCESS = \
 		-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
 		-e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
 		-e 's,@VARLOGDIR\@,$(varlogdir),g' \
+		-e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
+		-e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
@@ -4115,30 +4062,6 @@ if HAVE_KMOD
 		$(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
 endif
 
-
-if TARGET_FEDORA
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service single.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) rescue.service single.service )
-endif
-
-if TARGET_SUSE
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f local.service && \
-		$(LN_S) rc-local.service local.service )
-endif
-
-if TARGET_MAGEIA
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service )
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)