Remove more vestigial configureac printouts

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7eb773092266360236057b3943ae64fdcfae482e..67f57eb6618ebca77f00cd5bce1ad0e60a7d9bd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,6 @@ AM_CPPFLAGS = \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-       -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
        -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/elogind/\" \
@@ -158,7 +157,6 @@ AM_CPPFLAGS = \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-       -DELOGIND_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -401,8 +399,6 @@ libelogind_shared_la_SOURCES = \
        src/shared/virt.h \
        src/shared/architecture.c \
        src/shared/architecture.h \
-       src/shared/efivars.c \
-       src/shared/efivars.h \
        src/shared/fstab-util.c \
        src/shared/fstab-util.h \
        src/shared/path-util.c \
@@ -476,8 +472,6 @@ libelogind_shared_la_SOURCES = \
        src/shared/MurmurHash2.h \
        src/shared/acpi-fpdt.h \
        src/shared/acpi-fpdt.c \
-       src/shared/boot-timestamps.h \
-       src/shared/boot-timestamps.c \
        src/shared/mkdir.c \
        src/shared/mkdir.h \
        src/shared/smack-util.c \
@@ -651,8 +645,7 @@ src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
 # ------------------------------------------------------------------------------
-dist_factory_etc_DATA = \
-       factory/etc/nsswitch.conf
+dist_factory_etc_DATA =
 
 if HAVE_PAM
 dist_factory_pam_DATA = \
@@ -757,7 +750,6 @@ BUILT_SOURCES += \
 
 
 libelogind_internal_la_LIBADD = \
-       $(RT_LIBS) \
        libelogind-shared.la
 
 libelogind_internal_la_LDFLAGS = \
@@ -984,7 +976,6 @@ substitutions = \
        '|sysctldir=$(sysctldir)|' \
        '|systemgeneratordir=$(systemgeneratordir)|' \
        '|usergeneratordir=$(usergeneratordir)|' \
-       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -997,22 +988,13 @@ substitutions = \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
-       '|SUSHELL=$(SUSHELL)|' \
-       '|SULOGIN=$(SULOGIN)|' \
-       '|DEBUGTTY=$(DEBUGTTY)|' \
-       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
        '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \
        '|VARLOGDIR=$(varlogdir)|' \
-       '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
-       '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
        '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|' \
        '|systemsleepdir=$(systemsleepdir)|' \
        '|systemshutdowndir=$(systemshutdowndir)|' \
        '|binfmtdir=$(binfmtdir)|' \