Merge branch 'lukeshu-postmove' into lukeshu

# Conflicts: # src/libshared/Makefile
author: Luke Shumaker <lukeshu@sbcglobal.net> 2016-05-26 01:06:02 -0400
committer: Luke Shumaker <lukeshu@sbcglobal.net> 2016-05-26 01:06:02 -0400
commit: 88d0127d07f0de5b0aa536deaf2b84877a402a6b (patch)
tree: 066de356346419669f017bf8350691af3d0422e0
parent: 9155dec335ce55c5443088595717f282aa27f055 (diff)
parent: eeea4ae0f9e1652e553015c7db7d640ec172a7b5 (diff)
43 files changed, 135 insertions, 190 deletions
diff --git a/Makefile.am b/Makefile.am
index e4d42900fd..b4fad0ff39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2355,7 +2355,7 @@ systemd_update_done_SOURCES = \
 systemd_update_done_LDADD = \
 	libshared.la
 
-#@src/libcore/Makefile ---------------------------------------------------------
+#@src/systemd-shutdown/Makefile ------------------------------------------------
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
@@ -6424,7 +6424,7 @@ define generate-sym-test
 	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
-#@src/libsystemd/Makefile
+#@src/libsystemd/src/Makefile
 test-libsystemd-sym.c: \
 		$(top_builddir)/src/libsystemd/libsystemd.sym \
 		src/systemd/sd-journal.h \
@@ -6437,19 +6437,19 @@ test-libsystemd-sym.c: \
 		src/systemd/sd-event.h
 	$(generate-sym-test)
 
-#@src/libudev/Makefile
+#@src/libudev/src/Makefile
 test-libudev-sym.c: \
 		src/libudev/libudev.sym \
 		src/udev/udev.h
 	$(generate-sym-test)
 
-#@src/libsystemd/Makefile
+#@src/libsystemd/src/Makefile
 nodist_test_libsystemd_sym_SOURCES = \
 	test-libsystemd-sym.c
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
-#@src/libudev/Makefile
+#@src/libudev/src/Makefile
 nodist_test_libudev_sym_SOURCES = \
 	test-libudev-sym.c
 test_libudev_sym_CFLAGS = \
diff --git a/discard.mk b/discard.mk
index 7f746b325b..032fbf22e8 100644
--- a/discard.mk
+++ b/discard.mk
@@ -53,18 +53,18 @@ manual_tests =
 TEST_EXTENSIONS = .py
 PY_LOG_COMPILER = $(PYTHON)
 DISABLE_HARD_ERRORS = yes
-if ENABLE_TESTS
+ifneq ($(ENABLE_TESTS),)
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
 else
 noinst_PROGRAMS =
 TESTS =
 endif
-if ENABLE_BASH_COMPLETION
+ifneq ($(ENABLE_BASH_COMPLETION),)
 dist_bashcompletion_DATA = $(dist_bashcompletion_data)
 nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
 endif
-if ENABLE_ZSH_COMPLETION
+ifneq ($(ENABLE_ZSH_COMPLETION),)
 dist_zshcompletion_DATA = $(dist_zshcompletion_data)
 nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
 endif
@@ -291,7 +291,7 @@ rootlibexec_PROGRAMS = \
 	systemd-socket-proxyd \
 	systemd-update-done
 
-if HAVE_UTMP
+ifneq ($(HAVE_UTMP),)
 rootlibexec_PROGRAMS += \
 	systemd-update-utmp
 endif
@@ -446,7 +446,7 @@ nodist_systemunit_DATA = \
 	units/systemd-nspawn@.service \
 	units/systemd-update-done.service
 
-if HAVE_UTMP
+ifneq ($(HAVE_UTMP),)
 nodist_systemunit_DATA += \
 	units/systemd-update-utmp.service \
 	units/systemd-update-utmp-runlevel.service
@@ -499,7 +499,7 @@ EXTRA_DIST += \
 	units/systemd-update-done.service.in \
     units/tmp.mount.m4
 
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 nodist_systemunit_DATA += \
 	units/rc-local.service \
 	units/halt-local.service
@@ -565,7 +565,7 @@ HTML_FILES = \
 HTML_ALIAS = \
 	${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}}
 
-if ENABLE_MANPAGES
+ifneq ($(ENABLE_MANPAGES),)
 man_MANS = \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS)
@@ -589,7 +589,7 @@ docs/html/man:
 man/index.html: man/systemd.index.html
 	$(AM_V_LN)$(LN_S) -f systemd.index.html $@
 
-if HAVE_PYTHON
+ifneq ($(HAVE_PYTHON),)
 noinst_DATA += \
 	man/index.html
 endif
@@ -629,7 +629,7 @@ EXTRA_DIST += \
 	tools/xml_helper.py \
 	man/glib-event-glue.c
 
-if ENABLE_LDCONFIG
+ifneq ($(ENABLE_LDCONFIG),)
 dist_systemunit_DATA += \
 	units/ldconfig.service
 
@@ -676,7 +676,7 @@ coverage: all
 coverage_dir = coverage
 coverage_opts = --base-directory $(srcdir) --directory $(builddir) --rc 'geninfo_adjust_src_path=$(abspath $(srcdir))=>$(abspath $(builddir))'
 
-if ENABLE_COVERAGE
+ifneq ($(ENABLE_COVERAGE),)
 # reset run coverage tests
 lcov-run:
 	@rm -rf $(coverage_dir)
@@ -706,13 +706,13 @@ endif
 dist_factory_etc_DATA = \
 	factory/etc/nsswitch.conf
 
-if HAVE_PAM
+ifneq ($(HAVE_PAM),)
 dist_factory_pam_DATA = \
 	factory/etc/pam.d/system-auth \
 	factory/etc/pam.d/other
 endif
 
-if HAVE_GNUEFI
+ifneq ($(HAVE_GNUEFI),)
 efi_cppflags = \
 	$(EFI_CPPFLAGS) \
 	-I$(top_builddir) -include config.h \
@@ -736,7 +736,7 @@ efi_cflags = \
 	-Wsign-compare \
 	-Wno-missing-field-initializers
 
-if ARCH_X86_64
+ifneq ($(ARCH_X86_64),)
 efi_cflags += \
 	-mno-red-zone \
 	-mno-sse \
@@ -745,7 +745,7 @@ efi_cflags += \
 	-DGNU_EFI_USE_MS_ABI
 endif
 
-if ARCH_IA32
+ifneq ($(ARCH_IA32),)
 efi_cflags += \
 	-mno-sse \
 	-mno-mmx
@@ -763,7 +763,7 @@ efi_ldflags = \
 
 # Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
 # and add required symbols manually.
-if ARCH_AARCH64
+ifneq ($(ARCH_AARCH64),)
 efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
 EFI_FORMAT = -O binary
 else
@@ -933,7 +933,7 @@ units/user/%: units/user/%.m4 $(top_builddir)/config.status
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
-if ENABLE_POLKIT
+ifneq ($(ENABLE_POLKIT),)
 nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
@@ -997,7 +997,7 @@ EXTRA_DIST += \
 	man/custom-man.xsl
 
 # ------------------------------------------------------------------------------
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 sysvinit_DATA = \
 	docs/sysvinit/README
 
@@ -1022,8 +1022,8 @@ EXTRA_DIST += \
 SOCKETS_TARGET_WANTS += \
 	systemd-initctl.socket
 
-if HAVE_UTMP
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_UTMP),)
+ifneq ($(HAVE_SYSV_COMPAT),)
 MULTI_USER_TARGET_WANTS += \
 	systemd-update-utmp-runlevel.service
 GRAPHICAL_TARGET_WANTS += \
@@ -1057,7 +1057,7 @@ SYSINIT_TARGET_WANTS += \
 	systemd-sysctl.service \
 	systemd-ask-password-console.path
 
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 SYSTEM_UNIT_ALIASES += \
 	poweroff.target runlevel0.target \
 	rescue.target runlevel1.target \
@@ -1092,7 +1092,7 @@ GENERAL_ALIASES += \
 	$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
 	$(dbussystemservicedir)/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 INSTALL_DIRS += \
 	$(systemunitdir)/runlevel1.target.wants \
 	$(systemunitdir)/runlevel2.target.wants \
@@ -1147,7 +1147,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-rootprefix=$$dc_install_base \
 	--enable-compat-libs
 
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 DISTCHECK_CONFIGURE_FLAGS += \
 	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
 	--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
@@ -1157,7 +1157,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
 	--with-sysvrcnd-path=
 endif
 
-if ENABLE_SPLIT_USR
+ifneq ($(ENABLE_SPLIT_USR),)
 DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-split-usr
 else
diff --git a/move.sh b/move.sh
index 6867691ca3..384aad65a0 100755
--- a/move.sh
+++ b/move.sh
@@ -95,6 +95,8 @@ set -e
 	mv -T src/libudev/{src,include}/libudev.h
 
 	mv -T {man,src/systemd-activate}/systemd-activate.xml
+
+	mkdir src/systemd-shutdown
 )
 
 (
@@ -117,6 +119,6 @@ set -e
 			fi
                         printf '%s\n' "$line" >> "$file"
                 fi
-        done < Makefile.am
+        done < <(sed -r 's|^if (.*)|ifneq ($(\1),)|' <Makefile.am)
         rm .tmp.move.all
 )
diff --git a/src/boot/Makefile b/src/boot/Makefile
index 2d6ae9941a..1936c6cea7 100644
--- a/src/boot/Makefile
+++ b/src/boot/Makefile
@@ -20,8 +20,8 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_EFI
-if HAVE_BLKID
+ifneq ($(ENABLE_EFI),)
+ifneq ($(HAVE_BLKID),)
 bootctl_SOURCES = \
 	src/boot/bootctl.c
 
diff --git a/src/boot/efi/Makefile b/src/boot/efi/Makefile
index 1493053d81..747bf6925c 100644
--- a/src/boot/efi/Makefile
+++ b/src/boot/efi/Makefile
@@ -41,8 +41,8 @@ systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o
 systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so
 systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi
 
-if ENABLE_EFI
-if HAVE_GNUEFI
+ifneq ($(ENABLE_EFI),)
+ifneq ($(HAVE_GNUEFI),)
 bootlib_DATA = $(systemd_boot)
 
 $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
@@ -89,8 +89,8 @@ stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o))
 stub_solib = $(top_builddir)/src/boot/efi/stub.so
 stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub
 
-if ENABLE_EFI
-if HAVE_GNUEFI
+ifneq ($(ENABLE_EFI),)
+ifneq ($(HAVE_GNUEFI),)
 bootlib_DATA += $(stub)
 
 $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile
index 4a267340b9..1809ced197 100644
--- a/src/bus-proxyd/Makefile
+++ b/src/bus-proxyd/Makefile
@@ -66,7 +66,7 @@ EXTRA_DIST += \
 	units/systemd-bus-proxyd.service.m4.in \
 	units/user/systemd-bus-proxyd.service.in
 
-if HAVE_SMACK
+ifneq ($(HAVE_SMACK),)
 bus-proxyd-set-cap-hook:
 	-$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
 
diff --git a/src/coredump/Makefile b/src/coredump/Makefile
index 885ad7a299..2773dcee91 100644
--- a/src/coredump/Makefile
+++ b/src/coredump/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_COREDUMP
+ifneq ($(ENABLE_COREDUMP),)
 systemd_coredump_SOURCES = \
 	src/coredump/coredump.c \
 	src/coredump/coredump-vacuum.c \
@@ -29,7 +29,7 @@ systemd_coredump_SOURCES = \
 systemd_coredump_LDADD = \
 	libshared.la
 
-if HAVE_ELFUTILS
+ifneq ($(HAVE_ELFUTILS),)
 systemd_coredump_SOURCES += \
 	src/coredump/stacktrace.c \
 	src/coredump/stacktrace.h
diff --git a/src/firstboot/Makefile b/src/firstboot/Makefile
index e036a6290b..766692e288 100644
--- a/src/firstboot/Makefile
+++ b/src/firstboot/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_FIRSTBOOT
+ifneq ($(ENABLE_FIRSTBOOT),)
 systemd_firstboot_SOURCES = \
 	src/firstboot/firstboot.c
 
diff --git a/src/gpt-auto-generator/Makefile b/src/gpt-auto-generator/Makefile
index 1e355d9fc6..524989e9f2 100644
--- a/src/gpt-auto-generator/Makefile
+++ b/src/gpt-auto-generator/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if HAVE_BLKID
+ifneq ($(HAVE_BLKID),)
 systemgenerator_PROGRAMS +=  \
 	systemd-gpt-auto-generator
 
diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile
index edca803ae7..73c73896a7 100644
--- a/src/hibernate-resume/Makefile
+++ b/src/hibernate-resume/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_HIBERNATE
+ifneq ($(ENABLE_HIBERNATE),)
 systemgenerator_PROGRAMS += \
 	systemd-hibernate-resume-generator
 
diff --git a/src/hostname/Makefile b/src/hostname/Makefile
index 675b2ffdca..9ea51ffc02 100644
--- a/src/hostname/Makefile
+++ b/src/hostname/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_HOSTNAMED
+ifneq ($(ENABLE_HOSTNAMED),)
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c
 
diff --git a/src/import/Makefile b/src/import/Makefile
index bab0a1eed1..03de5589aa 100644
--- a/src/import/Makefile
+++ b/src/import/Makefile
@@ -20,13 +20,13 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_IMPORTD
+ifneq ($(ENABLE_IMPORTD),)
 
-if HAVE_LIBCURL
-if HAVE_XZ
-if HAVE_ZLIB
-if HAVE_BZIP2
-if HAVE_GCRYPT
+ifneq ($(HAVE_LIBCURL),)
+ifneq ($(HAVE_XZ),)
+ifneq ($(HAVE_ZLIB),)
+ifneq ($(HAVE_BZIP2),)
+ifneq ($(HAVE_GCRYPT),)
 
 rootlibexec_PROGRAMS += \
 	systemd-importd \
diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile
index 188ad7a67c..df233886df 100644
--- a/src/journal-remote/Makefile
+++ b/src/journal-remote/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if HAVE_MICROHTTPD
+ifneq ($(HAVE_MICROHTTPD),)
 rootlibexec_PROGRAMS += \
 	systemd-journal-remote
 
@@ -46,12 +46,12 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
 	$(MICROHTTPD_LIBS)
 
-if ENABLE_TMPFILES
+ifneq ($(ENABLE_TMPFILES),)
 dist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
 endif
 
-if HAVE_GNUTLS
+ifneq ($(HAVE_GNUTLS),)
 systemd_journal_remote_LDADD += \
 	$(GNUTLS_LIBS)
 endif
@@ -79,7 +79,7 @@ EXTRA_DIST += \
 	src/journal-remote/log-generator.py
 endif
 
-if HAVE_LIBCURL
+ifneq ($(HAVE_LIBCURL),)
 rootlibexec_PROGRAMS += \
 	systemd-journal-upload
 
diff --git a/src/journal/Makefile b/src/journal/Makefile
index 06874acb7f..1d843f1524 100644
--- a/src/journal/Makefile
+++ b/src/journal/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 audit_list_includes = -include linux/audit.h -include missing.h
-if HAVE_AUDIT
+ifneq ($(HAVE_AUDIT),)
 audit_list_includes += -include libaudit.h
 endif
 
@@ -71,7 +71,7 @@ journalctl_LDADD = \
 	libshared.la \
 	libudev-core.la
 
-if HAVE_QRENCODE
+ifneq ($(HAVE_QRENCODE),)
 journalctl_SOURCES += \
 	src/journal/journal-qrcode.c \
 	src/journal/journal-qrcode.h
@@ -253,7 +253,7 @@ tests += \
 	test-catalog \
 	test-audit-type
 
-if HAVE_COMPRESSION
+ifneq ($(HAVE_COMPRESSION),)
 tests += \
 	test-compress \
 	test-compress-benchmark
@@ -299,7 +299,7 @@ libsystemd_journal_internal_la_CFLAGS = \
 
 libsystemd_journal_internal_la_LIBADD =
 
-if HAVE_XZ
+ifneq ($(HAVE_XZ),)
 libsystemd_journal_internal_la_CFLAGS += \
 	$(XZ_CFLAGS)
 
@@ -307,12 +307,12 @@ libsystemd_journal_internal_la_LIBADD += \
 	$(XZ_LIBS)
 endif
 
-if HAVE_LZ4
+ifneq ($(HAVE_LZ4),)
 libsystemd_journal_internal_la_LIBADD += \
 	-llz4
 endif
 
-if HAVE_GCRYPT
+ifneq ($(HAVE_GCRYPT),)
 libsystemd_journal_internal_la_SOURCES += \
 	src/journal/journal-authenticate.c \
 	src/journal/journal-authenticate.h \
@@ -384,7 +384,7 @@ gperf_gperf_sources += \
 	src/journal/journald-gperf.gperf
 
 # ------------------------------------------------------------------------------
-if HAVE_MICROHTTPD
+ifneq ($(HAVE_MICROHTTPD),)
 gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
 
 rootlibexec_PROGRAMS += \
@@ -399,7 +399,7 @@ systemd_journal_gatewayd_LDADD = \
 	libshared.la \
 	$(MICROHTTPD_LIBS)
 
-if HAVE_GNUTLS
+ifneq ($(HAVE_GNUTLS),)
 systemd_journal_gatewayd_LDADD += \
 	$(GNUTLS_LIBS)
 endif
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index 87ec8ef9c3..90241bfba2 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -166,15 +166,3 @@ src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
-systemd_shutdown_SOURCES = \
-	src/core/umount.c \
-	src/core/umount.h \
-	src/core/shutdown.c \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/killall.h \
-	src/core/killall.c
-
-systemd_shutdown_LDADD = \
-	libshared.la
-
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 0a583544a6..ebaa1a2e33 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -106,7 +106,6 @@ libshared_la_SOURCES = \
 	src/shared/resolve-util.c \
 	src/shared/resolve-util.h
 
-
 ifneq ($(HAVE_UTMP),)
 libshared_la_SOURCES += \
 	src/shared/utmp-wtmp.c
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
deleted file mode 100644
index 7e7f0d00fc..0000000000
--- a/src/libsystemd/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#  -*- Mode: makefile; indent-tabs-mode: t -*-
-#
-#  This file is part of systemd.
-#
-#  Copyright 2010-2012 Lennart Poettering
-#  Copyright 2010-2012 Kay Sievers
-#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
-#  Copyright 2013 David Strauss
-#  Copyright 2016 Luke Shumaker
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-test-libsystemd-sym.c: \
-		$(top_builddir)/src/libsystemd/libsystemd.sym \
-		src/systemd/sd-journal.h \
-		src/systemd/sd-daemon.h \
-		src/systemd/sd-login.h \
-		src/systemd/sd-bus.h \
-		src/systemd/sd-utf8.h \
-		src/systemd/sd-resolve.h \
-		src/systemd/sd-path.h \
-		src/systemd/sd-event.h
-	$(generate-sym-test)
-
-nodist_test_libsystemd_sym_SOURCES = \
-	test-libsystemd-sym.c
-test_libsystemd_sym_LDADD = \
-	libsystemd.la
-
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile
index c221f37be0..166044e755 100644
--- a/src/libsystemd/compat-libs/Makefile
+++ b/src/libsystemd/compat-libs/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_COMPAT_LIBS
+ifneq ($(ENABLE_COMPAT_LIBS),)
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index 01a31f1d17..cf72f9ea95 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -357,3 +357,20 @@ busctl_SOURCES = \
 busctl_LDADD = \
 	libshared.la
 
+test-libsystemd-sym.c: \
+		$(top_builddir)/src/libsystemd/libsystemd.sym \
+		src/systemd/sd-journal.h \
+		src/systemd/sd-daemon.h \
+		src/systemd/sd-login.h \
+		src/systemd/sd-bus.h \
+		src/systemd/sd-utf8.h \
+		src/systemd/sd-resolve.h \
+		src/systemd/sd-path.h \
+		src/systemd/sd-event.h
+	$(generate-sym-test)
+
+nodist_test_libsystemd_sym_SOURCES = \
+	test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+	libsystemd.la
+
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
deleted file mode 100644
index 8aefffb488..0000000000
--- a/src/libudev/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#  -*- Mode: makefile; indent-tabs-mode: t -*-
-#
-#  This file is part of systemd.
-#
-#  Copyright 2010-2012 Lennart Poettering
-#  Copyright 2010-2012 Kay Sievers
-#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
-#  Copyright 2013 David Strauss
-#  Copyright 2016 Luke Shumaker
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-test-libudev-sym.c: \
-		src/libudev/libudev.sym \
-		src/udev/udev.h
-	$(generate-sym-test)
-
-nodist_test_libudev_sym_SOURCES = \
-	test-libudev-sym.c
-test_libudev_sym_CFLAGS = \
-	$(AM_CFLAGS) \
-	-Wno-deprecated-declarations
-test_libudev_sym_LDADD = \
-	libudev.la
-
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 2ff3272d48..3f1540b14a 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -75,3 +75,16 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES)
 
+test-libudev-sym.c: \
+		src/libudev/libudev.sym \
+		src/udev/udev.h
+	$(generate-sym-test)
+
+nodist_test_libudev_sym_SOURCES = \
+	test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+	$(AM_CFLAGS) \
+	-Wno-deprecated-declarations
+test_libudev_sym_LDADD = \
+	libudev.la
+
diff --git a/src/locale/Makefile b/src/locale/Makefile
index ef761dd57e..bf12de39c9 100644
--- a/src/locale/Makefile
+++ b/src/locale/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_LOCALED
+ifneq ($(ENABLE_LOCALED),)
 systemd_localed_SOURCES = \
 	src/locale/localed.c
 
diff --git a/src/login/Makefile b/src/login/Makefile
index 290dddf932..d9cf23ed64 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_LOGIND
+ifneq ($(ENABLE_LOGIND),)
 systemd_logind_SOURCES = \
 	src/login/logind.c \
 	src/login/logind.h
@@ -59,7 +59,7 @@ liblogind_core_la_SOURCES = \
 liblogind_core_la_LIBADD = \
 	libshared.la
 
-if HAVE_ACL
+ifneq ($(HAVE_ACL),)
 liblogind_core_la_SOURCES += \
 	src/login/logind-acl.c
 endif
@@ -129,7 +129,7 @@ tests += \
 	test-login-tables \
 	test-login-shared
 
-if HAVE_PAM
+ifneq ($(HAVE_PAM),)
 pam_systemd_la_SOURCES = \
 	src/login/pam_systemd.sym \
 	src/login/pam_systemd.c
@@ -215,7 +215,7 @@ EXTRA_DIST += \
 	units/systemd-logind.service.in
 
 # ------------------------------------------------------------------------------
-if HAVE_PAM
+ifneq ($(HAVE_PAM),)
 
 systemd_user_sessions_SOURCES = \
 	src/user-sessions/user-sessions.c
diff --git a/src/machine/src/Makefile b/src/machine/src/Makefile
index 4586d1d89b..096d95fcf4 100644
--- a/src/machine/src/Makefile
+++ b/src/machine/src/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_MACHINED
+ifneq ($(ENABLE_MACHINED),)
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
 	src/machine/machined.h
diff --git a/src/modules-load/Makefile b/src/modules-load/Makefile
index cbc8c113e9..61ecea1130 100644
--- a/src/modules-load/Makefile
+++ b/src/modules-load/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if HAVE_KMOD
+ifneq ($(HAVE_KMOD),)
 systemd_modules_load_SOURCES = \
 	src/modules-load/modules-load.c
 
@@ -41,7 +41,7 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
 	systemd-modules-load.service
 
-if ENABLE_TMPFILES
+ifneq ($(ENABLE_TMPFILES),)
 nodist_systemunit_DATA += \
 	units/kmod-static-nodes.service
 
diff --git a/src/network/Makefile b/src/network/Makefile
index d07bd61cfa..42af40ebbd 100644
--- a/src/network/Makefile
+++ b/src/network/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_NETWORKD
+ifneq ($(ENABLE_NETWORKD),)
 rootlibexec_PROGRAMS += \
 	systemd-networkd
 
@@ -30,7 +30,7 @@ systemd_networkd_SOURCES = \
 systemd_networkd_LDADD = \
 	libnetworkd-core.la
 
-if HAVE_LIBIPTC
+ifneq ($(HAVE_LIBIPTC),)
 systemd_networkd_LDADD += \
 	libfirewall.la
 endif
@@ -134,7 +134,7 @@ test_network_SOURCES = \
 test_network_LDADD = \
 	libnetworkd-core.la
 
-if HAVE_LIBIPTC
+ifneq ($(HAVE_LIBIPTC),)
 test_network_LDADD += \
 	libfirewall.la
 endif
@@ -147,7 +147,7 @@ test_network_tables_LDADD = \
 	libnetworkd-core.la \
 	libudev-core.la
 
-if HAVE_LIBIPTC
+ifneq ($(HAVE_LIBIPTC),)
 test_network_tables_LDADD += \
 	libfirewall.la
 endif
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
index 1c98453e33..d012e98b6e 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if HAVE_MYHOSTNAME
+ifneq ($(HAVE_MYHOSTNAME),)
 libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/nss-myhostname.sym \
 	src/nss-myhostname/nss-myhostname.c
diff --git a/src/resolve/src/Makefile b/src/resolve/src/Makefile
index 3aa6a73e4c..fafe8ab930 100644
--- a/src/resolve/src/Makefile
+++ b/src/resolve/src/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_RESOLVED
+ifneq ($(ENABLE_RESOLVED),)
 
 systemd_resolved_SOURCES = \
 	src/resolve/resolved.c \
diff --git a/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile
index 523b347aa4..6c736f11d8 100644
--- a/src/systemd-backlight/Makefile
+++ b/src/systemd-backlight/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_BACKLIGHT
+ifneq ($(ENABLE_BACKLIGHT),)
 rootlibexec_PROGRAMS += \
 	systemd-backlight
 
diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile
index 3099a7c86d..233df7c7a7 100644
--- a/src/systemd-binfmt/Makefile
+++ b/src/systemd-binfmt/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_BINFMT
+ifneq ($(ENABLE_BINFMT),)
 systemd_binfmt_SOURCES = \
 	src/binfmt/binfmt.c
 
diff --git a/src/systemd-bootchart/Makefile b/src/systemd-bootchart/Makefile
index 5af4cebd20..217b00d7e3 100644
--- a/src/systemd-bootchart/Makefile
+++ b/src/systemd-bootchart/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_BOOTCHART
+ifneq ($(ENABLE_BOOTCHART),)
 systemd_bootchart_SOURCES = \
 	src/bootchart/bootchart.c \
 	src/bootchart/bootchart.h \
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile
index a19f37582b..23e43a6999 100644
--- a/src/systemd-cryptsetup/Makefile
+++ b/src/systemd-cryptsetup/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if HAVE_LIBCRYPTSETUP
+ifneq ($(HAVE_LIBCRYPTSETUP),)
 rootlibexec_PROGRAMS += \
 	systemd-cryptsetup
 
diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile
index fb41e4d715..a3fb56525e 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/systemd-quotacheck/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_QUOTACHECK
+ifneq ($(ENABLE_QUOTACHECK),)
 rootlibexec_PROGRAMS += \
 	systemd-quotacheck
 
diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile
index 14f2476646..d245918018 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/systemd-random-seed/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_RANDOMSEED
+ifneq ($(ENABLE_RANDOMSEED),)
 rootlibexec_PROGRAMS += \
 	systemd-random-seed
 
diff --git a/src/systemd-rfkill/Makefile b/src/systemd-rfkill/Makefile
index 6602ba42c3..2ec5e136e0 100644
--- a/src/systemd-rfkill/Makefile
+++ b/src/systemd-rfkill/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_RFKILL
+ifneq ($(ENABLE_RFKILL),)
 rootlibexec_PROGRAMS += \
 	systemd-rfkill
 
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index a73886db36..1c5d529ca7 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -20,7 +20,6 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
@@ -32,3 +31,4 @@ systemd_shutdown_SOURCES = \
 
 systemd_shutdown_LDADD = \
 	libshared.la
+
diff --git a/src/systemd-timedate/Makefile b/src/systemd-timedate/Makefile
index b9f9b173f6..c86c12b650 100644
--- a/src/systemd-timedate/Makefile
+++ b/src/systemd-timedate/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_TIMEDATED
+ifneq ($(ENABLE_TIMEDATED),)
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
 
diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile
index da69b9173d..9bed9c694e 100644
--- a/src/systemd-timesync/Makefile
+++ b/src/systemd-timesync/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_TIMESYNCD
+ifneq ($(ENABLE_TIMESYNCD),)
 systemd_timesyncd_SOURCES = \
 	src/timesync/timesyncd.c \
 	src/timesync/timesyncd-manager.c \
diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile
index ddc7746125..1e3664b0b4 100644
--- a/src/systemd-tmpfiles/Makefile
+++ b/src/systemd-tmpfiles/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_TMPFILES
+ifneq ($(ENABLE_TMPFILES),)
 systemd_tmpfiles_SOURCES = \
 	src/tmpfiles/tmpfiles.c
 
@@ -51,7 +51,7 @@ dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd-nspawn.conf \
 	tmpfiles.d/journal-nocow.conf
 
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 dist_tmpfiles_DATA += \
 	tmpfiles.d/legacy.conf
 endif
diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile
index 0ba8c308c5..a53d0009fa 100644
--- a/src/systemd-vconsole/Makefile
+++ b/src/systemd-vconsole/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_VCONSOLE
+ifneq ($(ENABLE_VCONSOLE),)
 systemd_vconsole_setup_SOURCES = \
 	src/vconsole/vconsole-setup.c
 
diff --git a/src/sysusers/Makefile b/src/sysusers/Makefile
index 12b899c444..7d62d07c57 100644
--- a/src/sysusers/Makefile
+++ b/src/sysusers/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if ENABLE_SYSUSERS
+ifneq ($(ENABLE_SYSUSERS),)
 systemd_sysusers_SOURCES = \
 	src/sysusers/sysusers.c
 
@@ -40,7 +40,7 @@ nodist_sysusers_DATA = \
 	sysusers.d/systemd.conf \
 	sysusers.d/basic.conf
 
-if HAVE_REMOTE
+ifneq ($(HAVE_REMOTE),)
 nodist_sysusers_DATA += \
 	sysusers.d/systemd-remote.conf
 endif
diff --git a/src/udev/Makefile b/src/udev/Makefile
index 4c8d1cf3f0..e599d05a73 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -132,7 +132,7 @@ libudev_core_la_LIBADD = \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
-if HAVE_KMOD
+ifneq ($(HAVE_KMOD),)
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-kmod.c
 
@@ -140,12 +140,12 @@ dist_udevrules_DATA += \
 	rules/80-drivers.rules
 endif
 
-if HAVE_BLKID
+ifneq ($(HAVE_BLKID),)
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-blkid.c
 endif
 
-if HAVE_ACL
+ifneq ($(HAVE_ACL),)
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-uaccess.c \
 	src/login/logind-acl.c \
@@ -176,7 +176,7 @@ udevadm_LDADD = \
 	libudev-core.la
 
 # ------------------------------------------------------------------------------
-if ENABLE_HWDB
+ifneq ($(ENABLE_HWDB),)
 INSTALL_DIRS += \
 	$(sysconfdir)/udev/hwdb.d
 
@@ -227,15 +227,15 @@ EXTRA_DIST += \
 	hwdb/sdio.ids
 
 # ------------------------------------------------------------------------------
-if ENABLE_TESTS
+ifneq ($(ENABLE_TESTS),)
 TESTS += \
 	test/udev-test.pl
 
-if HAVE_PYTHON
+ifneq ($(HAVE_PYTHON),)
 TESTS += \
 	test/rule-syntax-check.py
 
-if HAVE_SYSV_COMPAT
+ifneq ($(HAVE_SYSV_COMPAT),)
 TESTS += \
 	test/sysv-generator-test.py
 endif
@@ -260,7 +260,7 @@ test_udev_LDADD = \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
-if ENABLE_TESTS
+ifneq ($(ENABLE_TESTS),)
 check_DATA += \
 	test/sys
 endif
diff --git a/test/Makefile b/test/Makefile
index 3959ab7c5b..7114c25c95 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -36,12 +36,12 @@ manual_tests += \
 	test-ipv4ll-manual \
 	test-ask-password-api
 
-if HAVE_LIBIPTC
+ifneq ($(HAVE_LIBIPTC),)
 manual_tests += \
 	test-firewall-util
 endif
 
-if HAVE_KMOD
+ifneq ($(HAVE_KMOD),)
 manual_tests += \
 	test-netlink-manual
 endif
@@ -119,7 +119,7 @@ tests += \
 	test-rlimit-util \
 	test-signal-util
 
-if HAVE_ACL
+ifneq ($(HAVE_ACL),)
 tests += \
 	test-acl-util
 endif
@@ -290,7 +290,7 @@ test_resolve_tables_SOURCES = \
 test_resolve_tables_LDADD = \
 	libshared.la
 
-if ENABLE_EFI
+ifneq ($(ENABLE_EFI),)
 manual_tests += \
 	test-boot-timestamp
 
@@ -637,7 +637,7 @@ test_btrfs_SOURCES = \
 test_btrfs_LDADD = \
 	libshared.la
 
-if HAVE_LIBIPTC
+ifneq ($(HAVE_LIBIPTC),)
 test_firewall_util_SOURCES = \
 	src/test/test-firewall-util.c
author	Luke Shumaker <lukeshu@sbcglobal.net>	2016-05-26 01:06:02 -0400
committer	Luke Shumaker <lukeshu@sbcglobal.net>	2016-05-26 01:06:02 -0400
commit	88d0127d07f0de5b0aa536deaf2b84877a402a6b (patch)
tree	066de356346419669f017bf8350691af3d0422e0
parent	9155dec335ce55c5443088595717f282aa27f055 (diff)
parent	eeea4ae0f9e1652e553015c7db7d640ec172a7b5 (diff)