X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3a50f4a98c52f704390fbf74feb5ca35577794f3;hp=94ae549b8f90ed15c077b124ab025a6684889189;hb=394e2938ff92c9bfc5b9e25c92c4df0fdea57c83;hpb=94f5bbc626f2a4102debd9b17c964170a887cb49 diff --git a/Makefile.am b/Makefile.am index 94ae549b8..3a50f4a98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,6 @@ AM_CPPFLAGS = \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ -DROOTPREFIX=\"$(rootprefix)\" \ - -DRUNTIME_DIR=\"/run\" \ -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ @@ -167,47 +166,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 \ @@ -225,9 +183,6 @@ bin_PROGRAMS = \ systemd-detect-virt \ systemd-delta -dist_bin_SCRIPTS = \ - src/analyze/systemd-analyze - rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ @@ -253,6 +208,15 @@ systemgenerator_PROGRAMS = \ systemd-fstab-generator \ systemd-system-update-generator +dist_bin_SCRIPTS = \ + src/analyze/systemd-analyze + +EXTRA_DIST += \ + src/analyze/systemd-analyze.in + +CLEANFILES += \ + src/analyze/systemd-analyze + dist_bashcompletion_DATA = \ shell-completion/systemd-bash-completion.sh @@ -406,34 +370,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 @@ -1893,6 +1838,7 @@ dist_udevrules_DATA += \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ + rules/80-net-name-slot.rules \ rules/95-udev-late.rules if HAVE_KMOD @@ -3362,8 +3308,8 @@ dist_pkgdata_DATA += \ dist_noinst_SCRIPT = \ src/locale/generate-kbd-model-map -update-kbd-model-map: - src/locale/generate-kbd-model-map > src/locale/kbd-model-map +update-kbd-model-map: src/locale/generate-kbd-model-map + $PYTHON $< > src/locale/kbd-model-map localectl_SOURCES = \ src/locale/localectl.c @@ -3856,6 +3802,10 @@ 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' \ + -e 's,@PYTHON\@,$(PYTHON),g' \ + -e 's,@PYTHON_BINARY\@,$(PYTHON_BINARY),g' \ < $< > $@ units/%: units/%.in Makefile @@ -3883,6 +3833,10 @@ src/%.policy.in: src/%.policy.in.in Makefile $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ +src/analyze/systemd-analyze: %: %.in Makefile + $(SED_PROCESS) + $(AM_V_GEN)chmod +x $@ + src/%.c: src/%.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(GPERF) < $< > $@ @@ -4120,30 +4074,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) @@ -4179,11 +4109,11 @@ DISTCHECK_CONFIGURE_FLAGS += \ endif hwdb-update: - ( cd hwdb && \ - wget -N http://www.linux-usb.org/usb.ids && \ - wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \ - wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \ - wget -N http://standards.ieee.org/develop/regauth/iab/iab.txt && \ + ( cd $(top_srcdir)/hwdb && \ + wget -N http://www.linux-usb.org/usb.ids \ + http://pci-ids.ucw.cz/v2.2/pci.ids \ + http://standards.ieee.org/develop/regauth/oui/oui.txt \ + http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) upload: all distcheck