locale: initialize locale from /etc/locale by default

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 725685dfb0b2ebf944e67417cb148c75145ec966..7632e553d8f7f2d981b4264578effe1d6a7ade46 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,10 +73,10 @@ rootlibexec_PROGRAMS = \
        systemd-update-utmp \
        systemd-random-seed \
        systemd-shutdownd \
-       systemd-auto-serial-getty \
        systemd-modules-load \
        systemd-remount-api-vfs \
-       systemd-kmsg-syslogd
+       systemd-kmsg-syslogd \
+       systemd-vconsole-setup
 
 noinst_PROGRAMS = \
        test-engine \
@@ -130,6 +130,7 @@ dist_systemunit_DATA = \
        units/network.target \
        units/nss-lookup.target \
        units/mail-transfer-agent.target \
+       units/http-daemon.target \
        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \
@@ -179,8 +180,8 @@ nodist_systemunit_DATA = \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
-       units/systemd-auto-serial-getty.service \
        units/systemd-modules-load.service \
+       units/systemd-vconsole-setup.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
@@ -206,8 +207,8 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
-       units/systemd-auto-serial-getty.service.in \
        units/systemd-modules-load.service.in \
+       units/systemd-vconsole-setup.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
@@ -233,6 +234,18 @@ dist_systemunit_DATA += \
        units/fedora/plymouth-halt.service
 endif
 
+if TARGET_DEBIAN
+dist_systemunit_DATA += \
+       units/debian/halt.service \
+       units/debian/killall.service \
+       units/debian/poweroff.service \
+       units/debian/reboot.service \
+       units/debian/fsck.target \
+       units/debian/umountfs.service \
+       units/debian/umountnfs.service \
+       units/debian/umountroot.service
+endif
+
 if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/halt.service \
@@ -330,6 +343,7 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
+       src/locale-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -575,18 +589,6 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
        libsystemd-basic.la
 
-systemd_auto_serial_getty_SOURCES = \
-       src/auto-serial-getty.c \
-       src/dbus-common.c
-
-systemd_auto_serial_getty_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_auto_serial_getty_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
-
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
@@ -596,6 +598,15 @@ systemd_modules_load_CFLAGS = \
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
+systemd_vconsole_setup_SOURCES = \
+       src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_vconsole_setup_LDADD = \
+       libsystemd-basic.la
+
 systemd_remount_api_vfs_SOURCES = \
        src/remount-api-vfs.c \
        src/mount-setup.c
@@ -896,14 +907,13 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
                $(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service systemd-auto-serial-getty.service && \
+               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service && \
-               $(LN_S) $(systemunitdir)/systemd-auto-serial-getty.service systemd-auto-serial-getty.service )
+               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target remote-fs.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target && \
@@ -968,11 +978,25 @@ if TARGET_GENTOO
                rm -f xdm.service && \
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
+if TARGET_DEBIAN
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/umount.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+               rm -f umountfs.service umountnfs.service umountroot.service && \
+               $(LN_S) ../umountfs.service umountfs.service && \
+               $(LN_S) ../umountnfs.service umountnfs.service && \
+               $(LN_S) ../umountroot.service umountroot.service )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f runlevel5.target && \
+               $(LN_S) multi-user.target runlevel5.target )
+endif
 if !TARGET_SUSE
+if !TARGET_DEBIAN
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f fsck.target && \
                $(LN_S) sysinit.target fsck.target )
 endif
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -984,7 +1008,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootdir=$$dc_install_base/$(rootdir)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/