From be77e289f05316c3cc17ff4546b8c8541f2d56bc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 1 Jun 2016 13:02:33 -0400 Subject: new autothing --- autoconf.mk | 38 +++++++ autoconf.mk.in | 38 +++++++ automake.head.mk | 56 ---------- automake.tail.mk | 140 ------------------------ automake.txt | 164 ---------------------------- build-aux/Makefile.once.head/00-dist.mk | 4 +- build-aux/Makefile.once.head/00-gnuconf.mk | 2 +- common.each.head.mk | 0 common.each.tail.mk | 3 - common.once.head.mk | 88 --------------- common.once.tail.mk | 93 ---------------- config.mk.in | 83 +------------- configure.ac | 11 +- gnustandards.mk.in | 99 ++++++++--------- src/libbasic/Makefile | 8 +- src/libfirewall/Makefile | 2 +- src/libshared/Makefile | 2 +- src/libsystemd/libsystemd-internal/Makefile | 4 +- src/systemd-nspawn/Makefile | 2 +- 19 files changed, 152 insertions(+), 685 deletions(-) create mode 100644 autoconf.mk create mode 100644 autoconf.mk.in delete mode 100644 automake.head.mk delete mode 100644 automake.tail.mk delete mode 100644 automake.txt delete mode 100644 common.each.head.mk delete mode 100644 common.each.tail.mk delete mode 100644 common.once.head.mk delete mode 100644 common.once.tail.mk diff --git a/autoconf.mk b/autoconf.mk new file mode 100644 index 0000000000..77135c228b --- /dev/null +++ b/autoconf.mk @@ -0,0 +1,38 @@ +PACKAGE = systemd +VERSION = 229 +PACKAGE_NAME = systemd +PACKAGE_TARNAME = systemd +PACKAGE_VERSION = 229 +PACKAGE_STRING = systemd 229 +PACKAGE_BUGREPORT = http://github.com/systemd/systemd/issues +PACKAGE_URL = http://www.freedesktop.org/wiki/Software/systemd + +ACLOCAL = ${SHELL} /home/luke/src/parabola/systemd/build-aux/missing aclocal-1.15 +AUTOCONF = ${SHELL} /home/luke/src/parabola/systemd/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /home/luke/src/parabola/systemd/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /home/luke/src/parabola/systemd/build-aux/missing automake-1.15 +CPP = gcc -E +CPPFLAGS = +ECHO_C = +ECHO_N = -n +ECHO_T = +FGREP = /usr/bin/grep -F# Requires AC_PROG_FGREP +GPERF = gperf +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +LIBTOOL = $(SHELL) $(top_builddir)/libtool +M4 = /usr/bin/m4 +M4_DEFINES = -DHAVE_SECCOMP -DHAVE_SELINUX -DHAVE_APPARMOR -DHAVE_PAM -DHAVE_ACL -DHAVE_SMACK -DHAVE_MICROHTTPD -DHAVE_LIBCURL -DHAVE_LIBIDN -DHAVE_LIBIPTC -DENABLE_TIMESYNCD -DENABLE_COREDUMP -DENABLE_RESOLVED -DENABLE_NETWORKD -DENABLE_KDBUS -DHAVE_SYSV_COMPAT +MANIFEST_TOOL = : +MKDIR_P = /usr/bin/mkdir -p# Requires AC_PROG_MKDIR_P +MSGFMT = /usr/bin/msgfmt +MSGMERGE = /usr/bin/msgmerge +NM = gcc-nm +NMEDIT = +OBJCOPY = objcopy +OBJDUMP = objdump +STRINGS = strings +STRIP = strip +XGETTEXT = /usr/bin/xgettext + +INSTALL_SCRIPT = ${INSTALL}# Requires AC_PROG_INSTALL +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s diff --git a/autoconf.mk.in b/autoconf.mk.in new file mode 100644 index 0000000000..2a5dc6053c --- /dev/null +++ b/autoconf.mk.in @@ -0,0 +1,38 @@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_URL = @PACKAGE_URL@ + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +FGREP = @FGREP@# Requires AC_PROG_FGREP +GPERF = @GPERF@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBTOOL = @LIBTOOL@ +M4 = @M4@ +M4_DEFINES = @M4_DEFINES@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@# Requires AC_PROG_MKDIR_P +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJCOPY = @OBJCOPY@ +OBJDUMP = @OBJDUMP@ +STRINGS = @STRINGS@ +STRIP = @STRIP@ +XGETTEXT = @XGETTEXT@ + +INSTALL_SCRIPT = @INSTALL_SCRIPT@# Requires AC_PROG_INSTALL +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/automake.head.mk b/automake.head.mk deleted file mode 100644 index 431f14da2b..0000000000 --- a/automake.head.mk +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (C) 2015-2016 Luke Shumaker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -_am = am_ - -_am_noslash = $(patsubst %/.,%,$(patsubst %/,%,$1)) -# These are all $(call _am_func,parent,child) -#_am_relto = $(if $2,$(shell realpath -sm --relative-to='$1' $2)) -_am_is_subdir = $(filter $(abspath $1)/%,$(abspath $2)/.) -_am_relto_helper = $(if $(call _am_is_subdir,$1,$2),$(patsubst $1/%,%,$(addsuffix /.,$2)),$(addprefix ../,$(call _am_relto_helper,$(patsubst %/,%,$(dir $1)),$2))) -_am_relto = $(call _am_noslash,$(call _am_relto_helper,$(call _am_noslash,$(abspath $1)),$(call _am_noslash,$(abspath $2)))) -# Note that _am_is_subdir says that a directory is a subdirectory of -# itself. -_am_path = $(call _am_relto,.,$1) -am_path = $(foreach p,$1,$(call _am_relto,.,$p)) - -## Declare the default target -all: build -.PHONY: all - -## Set outdir and srcdir (assumes that topoutdir and topsrcdir are -## already set) -outdir := $(call _am_path,$(dir $(lastword $(filter-out %.mk,$(MAKEFILE_LIST))))) -srcdir := $(call _am_path,$(topsrcdir)/$(call _am_relto,$(topoutdir),$(outdir))) - -_am_included_makefiles := $(_am_included_makefiles) $(call _am_path,$(outdir)/Makefile) - -## Empty variables for use by each Makefile -$(_am)subdirs = -$(_am)depdirs = - -$(_am)src_files = -$(_am)gen_files = -$(_am)cfg_files = -$(_am)out_files = -$(_am)sys_files = - -$(_am)clean_files = -$(_am)slow_files = - -ifeq ($(_am_NO_ONCE),) -include $(topsrcdir)/common.once.head.mk -endif -include $(topsrcdir)/common.each.head.mk diff --git a/automake.tail.mk b/automake.tail.mk deleted file mode 100644 index ba31935793..0000000000 --- a/automake.tail.mk +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright (C) 2015-2016 Luke Shumaker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -include $(topsrcdir)/common.each.tail.mk - - -# Aggregate variables - -# Add some more defaults to the *_files variables -$(_am)clean_files += $($(_am)gen_files) $($(_am)cfg_files) $($(_am)out_files) - -# Now namespace the *_files variables -define _am_save_variables -_am_src_files/$(outdir) = $(addprefix $(srcdir)/,$($(_am)src_files)) -_am_gen_files/$(outdir) = $(addprefix $(srcdir)/,$($(_am)gen_files)) -_am_cfg_files/$(outdir) = $(addprefix $(outdir)/,$($(_am)cfg_files)) -_am_out_files/$(outdir) = $(addprefix $(outdir)/,$($(_am)out_files)) -_am_sys_files/$(outdir) = $(addprefix $(DESTDIR),$($(_am)sys_files)) -_am_clean_files/$(outdir) = $(addprefix $(outdir)/,$($(_am)clean_files)) -_am_slow_files/$(outdir) = $(addprefix $(outdir)/,$($(_am)slow_files)) -_am_subdirs/$(outdir) = $($(_am)subdirs) -endef -$(eval $(_am_save_variables)) - -# And add them to the $(parent)_*_files variables (if applicable) -define _am_add_subdir -_am_src_files/%(outdir) += $(_am_src_files/%(subdir)) -_am_gen_files/%(outdir) += $(_am_gen_files/%(subdir)) -_am_cfg_files/%(outdir) += $(_am_cfg_files/%(subdir)) -_am_out_files/%(outdir) += $(_am_out_files/%(subdir)) -_am_sys_files/%(outdir) += $(_am_sys_files/%(subdir)) -_am_clean_files/%(outdir) += $(_am_clean_files/%(subdir)) -_am_slow_files/%(outdir) += $(_am_slow_files/%(subdir)) -endef -$(foreach subdir,$(call _am_path,$(addprefix $(outdir)/,$($(_am)subdirs))),$(eval $(subst %(outdir),$(outdir),$(subst %(subdir),$(subdir),$(value _am_add_subdir))))) - -_am_outdirs := $(_am_outdirs) $(outdir) - - -# Do some per-directory magic - -_am_phony = build install uninstall mostlyclean clean distclean maintainer-clean check - -.PHONY: $(addprefix $(outdir)/,$(_am_phony)) - -$(addprefix $(outdir)/,uninstall mostlyclean clean distclean maintainer-clean):: - $(RM) -- $(filter-out %/,$(sort $(_am_$(@F)/$(@D)))) - $(RM) -r -- $(filter %/,$(sort $(_am_$(@F)/$(@D)))) - $(RMDIRS) $(sort $(dir $(patsubst %/,%,$(_am_$(@F)/$(@D))))) 2>/dev/null || $(TRUE) - -# 'build' and 'install' must be defined later, because the -# am_*_files/* variables might not be complete yet. - - -# Include Makefiles from other directories - -define _am_nl - - -endef - -$(foreach _am_NO_ONCE,y,\ - $(foreach makefile,$(foreach dir,$($(_am)subdirs) $($(_am)depdirs),$(call _am_path,$(outdir)/$(dir)/Makefile)),\ - $(eval include $(filter-out $(_am_included_makefiles),$(makefile))))) - - -# This only gets evaluated once, after all of the other Makefiles are read -ifeq ($(_am_NO_ONCE),) -# Empty directory-level variables -outdir = /bogus -srcdir = /bogus - -$(_am)subdirs = -$(_am)depdirs = - -$(_am)src_files = -$(_am)gen_files = -$(_am)cfg_files = -$(_am)out_files = -$(_am)sys_files = -$(_am)clean_files = -$(_am)slow_files = - -_am_clean_files/$(topoutdir) += $(topoutdir)/$(PACKAGE)-$(VERSION).tar.gz -$(addprefix $(topoutdir)/,mostlyclean clean distclean maintainer-clean) :: - $(RM) -r -- $(topoutdir)/$(PACKAGE)-$(VERSION) - -define _am_directory_rules -# Constructive phony targets -$(outdir)/build : $(_am_out_files/%(outdir)) -$(outdir)/install: $(_am_sys_files/%(outdir)) -# Destructive phony targets -_am_uninstall/%(outdir) = $(_am_sys_files/%(outdir)) -_am_mostlyclean/%(outdir) = $(filter-out $(_am_slow_files/%(outdir)) $(_am_cfg_files/%(outdir)) $(_am_gen_files/%(outdir)) $(_am_src_files/%(outdir)),$(_am_clean_files/%(outdir))) -_am_clean/%(outdir) = $(filter-out $(_am_cfg_files/%(outdir)) $(_am_gen_files/%(outdir)) $(_am_src_files/%(outdir)),$(_am_clean_files/%(outdir))) -_am_distclean/%(outdir) = $(filter-out $(_am_gen_files/%(outdir)) $(_am_src_files/%(outdir)),$(_am_clean_files/%(outdir))) -_am_maintainer-clean/%(outdir) = $(filter-out $(_am_src_files/%(outdir)),$(_am_clean_files/%(outdir))) -endef -$(foreach outdir,$(_am_outdirs),$(eval $(subst %(outdir),$(outdir),$(value _am_directory_rules)))) - -# Add the `dist` target -.PHONY: dist -dist: $(topoutdir)/$(PACKAGE)-$(VERSION).tar.gz -$(topoutdir)/$(PACKAGE)-$(VERSION).tar.gz: $(topoutdir)/$(PACKAGE)-$(VERSION) - $(TAR) czf $@ -C $(. -AM_CPPFLAGS = @OUR_CPPFLAGS@ -AM_CFLAGS = @OUR_CFLAGS@ -AM_LDFLAGS = @OUR_LDFLAGS@ -AM_LIBTOOLFLAGS = - -ALL_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS/$(@D)) -ALL_CFLAGS = $(CFLAGS) $(AM_CFLAGS) $(CFLAGS/$(@D)) -ALL_LDFLAGS = $(LDFLAGS) $(AM_LDFLAGS) $(LDFLAGS/$(@D)) -ALL_LIBTOOLFLAGS = $(LIBTOOLFLAGS) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS/$(@D)) - -AM_CPPFLAGS += -include $(topoutdir)/config.h - -GCC_COLORS ?= 'ooh, shiny!' -export GCC_COLORS - -# remove targets if the command fails -.DELETE_ON_ERROR: - -# keep intermediate files -.SECONDARY: - -# Keep the test-suite.log -.PRECIOUS: $(TEST_SUITE_LOG) Makefile - -%-from-name.gperf: %-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ - -%-from-name.h: %-from-name.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ - -# Stupid test that everything purported to be exported really is -define generate-sym-test - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_at)printf '#include \n' > $@ - $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@ - $(AM_V_at)printf 'void* functions[] = {\n' >> $@ - $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@ - $(AM_V_at)printf '};\nint main(void) {\n' >> $@ - $(AM_V_at)printf 'unsigned i; for (i=0;i> $@ - $(AM_V_at)printf 'return 0; }\n' >> $@ -endef - - -lib_LTLIBRARIES -pkginclude_HEADERS - -o = $(if $(filter lib%,$(notdir $2)),lo,o) -m = $(subst -,_,$(subst .,_,$2)) -define amtarget2dir -am_out_files += $(notdir $2) -LDFLAGS/$(outdir) += $($m_LDFLAGS) -CFLAGS/$(outdir) += $($m_CFLAGS) -LDFLAGS/$(outdir) += $($m_LDFLAGS) -$(outdir)/$(notdir $2): $(filter %.$o,$(patsubst $(addsuffix /%.c,$1),%.$o,$($m_SOURCES))) $($m_LIBADD) - -am_out_files += $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -am_sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) -endef - -$(topoutdir)/config.mk: $(topoutdir)/config.status $(topsrcdir)/config.mk.in - cd $(topoutdir) && ./config.status - -include $(topsrcdir)/am-pretty.mk -include $(topsrcdir)/am-tools.mk diff --git a/common.once.tail.mk b/common.once.tail.mk deleted file mode 100644 index d58c892243..0000000000 --- a/common.once.tail.mk +++ /dev/null @@ -1,93 +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 . -# Let's run all tests of the test suite, but under valgrind. Let's -# exclude perl/python/shell scripts we have in there -.PHONY: valgrind-tests -valgrind-tests: $(TESTS) - $(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \ - if file $$f | grep -q shell; then \ - echo -e "$${x}Skipping non-binary $$f"; else \ - echo -e "$${x}Running $$f"; \ - $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ - x="\n\n"; \ - done - -exported-%: % - $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@ - -exported: $(addprefix exported-, $(lib_LTLIBRARIES)) - $(AM_V_GEN)sort -u $^ > $@ - -.PHONY: check-api-docs -check-api-docs: exported man - $(AM_V_GEN)for symbol in `cat exported` ; do \ - if test -f $(builddir)/man/$$symbol.html ; then \ - echo " Symbol $$symbol() is documented." ; \ - else \ - echo "‣ Symbol $$symbol() lacks documentation." ; \ - fi ; \ - done - -OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES)) -ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v))) - -undefined defined: $(ALL_OBJECTS) - $(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \ - $(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \ - done | cut -c 20- | cut -d @ -f 1 | sort -u > $@ - -CLEANFILES += \ - defined \ - undefined - -.PHONY: check-api-unused -check-api-unused: defined undefined exported - ( cat exported undefined ) | sort -u | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2- - -.PHONY: check-includes -check-includes: $(top_srcdir)/tools/check-includes.pl - $(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \ - | xargs $(top_srcdir)/tools/check-includes.pl - -EXTRA_DIST += \ - $(top_srcdir)/tools/check-includes.pl - -.PHONY: cppcheck -cppcheck: - cppcheck --enable=all -q $(top_srcdir) - -# Used to extract compile flags for YCM. -print-%: - @echo $($*) - -git-contrib: - @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u - -EXTRA_DIST += \ - tools/gdb-sd_dump_hashmaps.py - -list-keys: - gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys - -add-key: - gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import - diff --git a/config.mk.in b/config.mk.in index e6fc618bda..6b25f373a8 100644 --- a/config.mk.in +++ b/config.mk.in @@ -30,26 +30,12 @@ topoutdir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) abs_topsrcdir := @abs_top_srcdir@ topsrcdir = $(if $(value am_path),$(call am_path,$(abs_topsrcdir)),$(abs_topsrcdir)) -# Standard package directories -prefix = @prefix@ -exec_prefix = @exec_prefix@ +include $(topsrcdir)/gnustandards.mk +include $(topsrcdir)/autoconf.mk -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ - -datarootdir = @datarootdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -runstatedir = @runstatedir@ - -includedir = @includedir@ -docdir = @docdir@ -libdir = @libdir@ -localedir = @localedir@ -mandir = @mandir@ +OUR_CPPFLAGS = @OUR_CPPFLAGS@ +OUR_CFLAGS = @OUR_CFLAGS@ +OUR_LDFLAGS = @OUR_LDFLAGS@ # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -234,27 +220,10 @@ HAVE_ZLIB = @HAVE_ZLIB_TRUE@1 LIBTOOLFLAGS = -AR = @AR@ -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CPP = @CPP@ -EGREP = @EGREP@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -GPERF = @GPERF@ GMSGFMT = @GMSGFMT@ KBD_LOADKEYS = @KBD_LOADKEYS@ KBD_SETFONT = @KBD_SETFONT@ @@ -262,36 +231,18 @@ KEXEC = @KEXEC@ KILL = @KILL@ KMOD = @KMOD@ LD = @LD@ -LIBTOOL = @LIBTOOL@ -M4 = @M4@ -MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -OBJCOPY = @OBJCOPY@ -OBJDUMP = @OBJDUMP@ PKG_CONFIG = @PKG_CONFIG@ PYTHON = @PYTHON@ QEMU = @QEMU@ QUOTACHECK = @QUOTACHECK@ QUOTAON = @QUOTAON@ -RANLIB = @RANLIB@ -SED = @SED@ SETCAP = @SETCAP@ -SHELL = @SHELL@ -STRINGS = @STRINGS@ -STRIP = @STRIP@ SULOGIN = @SULOGIN@ SUSHELL = @SUSHELL@ UMOUNT_PATH = @UMOUNT_PATH@ XSLTPROC = @XSLTPROC@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ - AMTAR = @AMTAR@ CCDEPMODE = @CCDEPMODE@ CERTIFICATEROOT = @CERTIFICATEROOT@ @@ -301,9 +252,6 @@ DEPDIR = @DEPDIR@ DNS_SERVERS = @DNS_SERVERS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EFI_ARCH = @EFI_ARCH@ EFI_CC = @EFI_CC@ EFI_INC_DIR = @EFI_INC_DIR@ @@ -318,20 +266,12 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -M4_DEFINES = @M4_DEFINES@ MAINT = @MAINT@ NMEDIT = @NMEDIT@ NTP_SERVERS = @NTP_SERVERS@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ -PACKAGE = systemd -PACKAGE_BUGREPORT = http://github.com/systemd/systemd/issues -PACKAGE_NAME = systemd -PACKAGE_STRING = systemd 229 -PACKAGE_TARNAME = systemd -PACKAGE_URL = http://www.freedesktop.org/wiki/Software/systemd -PACKAGE_VERSION = 229 PATH_SEPARATOR = : PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = /home/luke/.prefix/lib/pkgconfig @@ -350,19 +290,6 @@ SYSTEM_UID_MAX = 999 TELINIT = /lib/sysvinit/telinit TTY_GID = 5 USE_NLS = yes -VERSION = 229 -XGETTEXT = /usr/bin/xgettext - -ac_ct_AR = gcc-ar -ac_ct_CC = gcc -ac_ct_DUMPBIN = -ac_ct_NM = gcc-nm -ac_ct_RANLIB = gcc-ranlib -am__include = include -am__leading_dot = . -am__quote = -am__tar = tar --format=posix -chf - "$$tardir" -am__untar = tar -xf - build = x86_64-unknown-linux-gnu build_alias = diff --git a/configure.ac b/configure.ac index 250d3d4e58..a4ffebea06 100644 --- a/configure.ac +++ b/configure.ac @@ -86,11 +86,17 @@ GETTEXT_PACKAGE=systemd AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [systemd]) +AC_PROG_AWK +AC_PROG_GREP +AC_PROG_EGREP +AC_PROG_FGREP +AC_PROG_INSTALL AC_PROG_MKDIR_P +AC_PROG_LEX AC_PROG_LN_S +AC_PROG_RANLIB AC_PROG_SED -AC_PROG_GREP -AC_PROG_AWK +AC_PROG_YACC AC_PATH_PROG([M4], [m4]) @@ -1505,6 +1511,7 @@ AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_CONFIG_FILES([ config.mk automake.mk + autoconf.mk gnustandards.mk po/Makefile.in ]) diff --git a/gnustandards.mk.in b/gnustandards.mk.in index bc8f8e97b8..9c0dced485 100644 --- a/gnustandards.mk.in +++ b/gnustandards.mk.in @@ -3,77 +3,78 @@ # It's ok to hard-code these commands in rules, but who wants to # memorize the list of what's ok? -AWK = @AWK@ -CAT = @CAT@ -CMP = @CMP@ -CP = @CP@ -DIFF = @DIFF@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXPR = @EXPR@ -FALSE = @FALSE@ -GREP = @GREP@ -INSTALL_INFO = @INSTALL_INFO@ -LN = @LN@ -LS = @LS@ -MKDIR = @MKDIR@ -MV = @MV@ -PRINTF = @PRINTF@ -PWD = @PWD@ -RM = @RM@ -RMDIR = @RMDIR@ -SED = @SED@ -SLEEP = @SLEEP@ -SORT = @SORT@ -TAR = @TAR@ -TEST = @TEST@ -TOUCH = @TOUCH@ -TR = @TR@ -TRUE = @TRUE@ +AWK = @AWK@# Requires AC_PROG_AWK +CAT = cat +CMP = cmp +CP = cp +DIFF = diff +ECHO = echo +EGREP = @EGREP@# Requires AC_PROG_EGREP +EXPR = expr +FALSE = false +GREP = @GREP@# Requires AC_PROG_GREP +INSTALL_INFO = install-info +LN = ln +LS = ls +MKDIR = mkdir +MV = mv +PRINTF = printf +PWD = pwd +RM = rm -f +RMDIR = rmdir +SED = sed +SLEEP = sleep +SORT = sort +TAR = tar +TEST = test +TOUCH = touch +TR = tr +TRUE = true # These must be user-configurable AR = @AR@ -ARFLAGS = @ARFLAGS@ -BISON = @BISON@ -BISONFLAGS = @BISONFLAGS@ +ARFLAGS = +BISON = bison +BISONFLAGS = CC = @CC@ CCFLAGS = $(CFLAGS) -FLEX = @FLEX@ -FLEXFLAGS = @FLEXFLAGS@ -INSTALL = @INSTALL@ -#INSTALLFLAGS = @INSTALLFLAGS@ +FLEX = flex +FLEXFLAGS = +INSTALL = @INSTALL@# Requires AC_PROG_INSTALL +#INSTALLFLAGS = LD = @LD@ LDFLAGS = @LDFLAGS@ -LDCONFIG = @LDCONFIG@ -LDCONFIGFLAGS = @LDCONFIGFLAGS@ +LDCONFIG = ldconfig +LDCONFIGFLAGS = LEX = @LEX@ +LEXLIB = @LEXLIB@ LEXFLAGS = $(LFLAGS) #MAKE MAKEINFO = @MAKEINFO@ -MAKEINFOFLAGS = @MAKEINFOFLAGS@ +MAKEINFOFLAGS = RANLIB = @RANLIB@ -RANLIBFLAGS = @RANLIBFLAGS@ -TEXI2DVI = @TEXI2DVI@ -TEXI2DVIFLAGS = @TEXI2DVIFLAGS@ +RANLIBFLAGS = +TEXI2DVI = texi2dvi +TEXI2DVIFLAGS = YACC = @YACC@ YACCFLAGS = $(YFLAGS) CFLAGS = @CFLAGS@ -LFLAGS = @LFLAGS@ +LFLAGS = YFLAGS = @YFLAGS@ LN_S = @LN_S@ -CHGRP = @CHGRP@ -CHMOD = @CHMOD@ -CHOWN = @CHOWN@ -MKNOD = @MKNOD@ +CHGRP = chgrp +CHMOD = chmod +CHOWN = chown +MKNOD = mknod # 7.2.3 Variables for Specifying Commands # --------------------------------------- -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@# Requires AC_PROG_INSTALL +INSTALL_DATA = @INSTALL_DATA@# Requires AC_PROG_INSTALL # 7.2.5 Variables for Installation Directories # -------------------------------------------- @@ -91,7 +92,7 @@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ -runstatedir = $(localstatedir)/run +runstatedir = $(localstatedir)/run# Requires Autoconf 2.70+ # Specific types of files includedir = @includedir@ oldincludedir = @oldincludedir@ @@ -102,7 +103,7 @@ dvidir = @dvidir@ pdfdir = @pdfdir@ psdir = @psdir@ libdir = @libdir@ -lispdir = $(datarootdir)/emacs/site-lisp# Autoconf 2.70+ +lispdir = $(datarootdir)/emacs/site-lisp# Requires manual configure.ac support localedir = @localedir@ mandir = @mandir@ diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile index de5da89a24..51ee19aad4 100644 --- a/src/libbasic/Makefile +++ b/src/libbasic/Makefile @@ -21,7 +21,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk -include $(topsrcdir)/automake.head.mk +include $(topsrcdir)/build-aux/Makefile.head.mk libbasic_la_SOURCES = \ src/basic/missing.h \ @@ -216,14 +216,14 @@ libbasic_la_SOURCES = \ src/basic/formats-util.h \ src/basic/nss-util.h -am_out_files = libbasic.la +std.out_files = libbasic.la CFLAGS += -pthread CPPFLAGS += $(libsystemd.CPPFLAGS) $(libselinux.CPPFLAGS) $(libcap.CPPFLAGS) $(outdir)/libbasic.la: \ $(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) \ $(libselinux.DEPENDS) $(libcap.DEPENDS) -lrt -lm -am_clean_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt +std.gen_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt $(outdir)/af-list.lo: $(outdir)/af-from-name.h $(outdir)/af-to-name.h $(outdir)/arphrd-list.lo: $(outdir)/arphrd-from-name.h $(outdir)/arphrd-to-name.h @@ -267,4 +267,4 @@ $(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt $(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ -include $(topsrcdir)/automake.tail.mk +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index c6519157c6..a6a4bc9ebc 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -am_out_files = libfirewall.la +std.out_files = libfirewall.la CPPFLAGS += $(libbasic.CPPFLAGS) $(libiptc.CPPFLAGS) $(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS) diff --git a/src/libshared/Makefile b/src/libshared/Makefile index b2aaf58b2c..66a38ea7f8 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -137,7 +137,7 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) -am_out_files += libshared.la +std.out_files += libshared.la CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include CPPFLAGS += -I$(topoutdir)/src/libsystemd/include CPPFLAGS += -I$(topsrcdir)/src/libbasic diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 9874139a9f..995eff1659 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -120,10 +120,10 @@ libsystemd_internal_la_LIBADD = \ noinst_LTLIBRARIES += \ libsystemd-internal.la -am_out_files += libsystemd-internal.la +std.out_files += libsystemd-internal.la CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" -am_subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES)))) +am.subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES)))) $(outdir)/libsystemd-internal.la: \ $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \ $(libbasic.DEPENDS) -lresolv diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 9adc4a0dea..0bcc238b72 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -52,7 +52,7 @@ nodist_systemd_nspawn_SOURCES = \ gperf_gperf_sources += \ src/nspawn/nspawn-gperf.gperf -am_out_files = systemd-nspawn +std.out_files = systemd-nspawn CPPFLAGS += $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) $(libsystemd.CPPFLAGS) $(libudev.CPPFLAGS) $(libblkid.CPPFLAGS) CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink -I$(topsrcdir)/src/libsystemd/src/sd-bus -I$(topsrcdir)/src/udev -I$(topsrcdir)/src/libudev/src CPPFLAGS += $(libblkid.CPPFLAGS) $(libseccomp.CPPFLAGS) -- cgit v1.2.3-54-g00ecf