X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=278da18e1124be9ef5d284fa01e56230eff25679;hp=77aed920a5aa705c010b71cc51296bc09e52bd7b;hb=3b8c1cb01f1b752543738779668d9841ecbca0d3;hpb=18c7ed186be28800a2eeb37ad31c9c44480d3d9c

diff --git a/Makefile.am b/Makefile.am
index 77aed920a..278da18e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 += \
@@ -1400,6 +1398,7 @@ systemd_remount_fs_SOURCES = \
 	src/core/mount-setup.h
 
 systemd_remount_fs_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1427,8 +1426,6 @@ systemctl_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-journal-internal.la \
-	libsystemd-id128-internal.la \
 	libsystemd-dbus.la \
 	libsystemd-logs.la
 
@@ -3595,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
 
@@ -3621,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)