diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rwxr-xr-x | move.sh | 6 |
3 files changed, 39 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 8df3035987..50a65d2dfe 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,9 @@ /TAGS /ata_id /bootctl -/build-aux +/build-aux/* +!/build-aux/Makefile* +!/build-aux/write-ifchanged /busctl /cdrom_id /collect @@ -296,3 +298,8 @@ config.status configure stamp-* .tmp* +/autoconf.mk +/automake.mk.in +/automake.mk +/config.mk +/gnustandards.mk diff --git a/Makefile.am b/Makefile.am index 062f866195..9827255904 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,9 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + #@build-aux/Makefile.once.head/20-systemd.mk ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory @@ -45,7 +48,7 @@ LIBUDEV_CURRENT=7 LIBUDEV_REVISION=4 LIBUDEV_AGE=6 -#@src/libsystemd/libsystemd-internal/Makefile +#@src/libsystemd/Makefile LIBSYSTEMD_CURRENT=14 LIBSYSTEMD_REVISION=0 LIBSYSTEMD_AGE=14 @@ -359,40 +362,42 @@ INSTALL_EXEC_HOOKS += \ install-busnames-target-wants-hook #@am-pretty.mk ----------------------------------------------------------------- +V ?= + AM_V_M4 = $(AM_V_M4_$(V)) AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) AM_V_M4_0 = @echo " M4 " $@; -AM_V_M4_1 = +AM_V_M4_1 = AM_V_XSLT = $(AM_V_XSLT_$(V)) AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) AM_V_XSLT_0 = @echo " XSLT " $@; -AM_V_XSLT_1 = +AM_V_XSLT_1 = AM_V_GPERF = $(AM_V_GPERF_$(V)) AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY)) AM_V_GPERF_0 = @echo " GPERF " $@; -AM_V_GPERF_1 = +AM_V_GPERF_1 = AM_V_LN = $(AM_V_LN_$(V)) AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY)) AM_V_LN_0 = @echo " LN " $@; -AM_V_LN_1 = +AM_V_LN_1 = AM_V_RM = $(AM_V_RM_$(V)) AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) AM_V_RM_0 = @echo " RM " $@; -AM_V_RM_1 = +AM_V_RM_1 = AM_V_CC = $(AM_V_CC_$(V)) AM_V_CC_ = $(AM_V_CC_$(AM_DEFAULT_VERBOSITY)) AM_V_CC_0 = @echo " CC " $@; -AM_V_CC_1 = +AM_V_CC_1 = AM_V_CCLD = $(AM_V_CCLD_$(V)) AM_V_CCLD_ = $(AM_V_CCLD_$(AM_DEFAULT_VERBOSITY)) AM_V_CCLD_0 = @echo " CCLD " $@; -AM_V_CCLD_1 = +AM_V_CCLD_1 = AM_V_P = $(AM_V_P_$(V)) AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY)) @@ -402,17 +407,23 @@ AM_V_P_1 = : AM_V_GEN = $(AM_V_GEN_$(V)) AM_V_GEN_ = $(AM_V_GEN_$(AM_DEFAULT_VERBOSITY)) AM_V_GEN_0 = @echo " GEN " $@; -AM_V_GEN_1 = +AM_V_GEN_1 = AM_V_at = $(AM_V_at_$(V)) AM_V_at_ = $(AM_V_at_$(AM_DEFAULT_VERBOSITY)) AM_V_at_0 = @ -AM_V_at_1 = +AM_V_at_1 = AM_V_lt = $(AM_V_lt_$(V)) AM_V_lt_ = $(AM_V_lt_$(AM_DEFAULT_VERBOSITY)) AM_V_lt_0 = --silent -AM_V_lt_1 = +AM_V_lt_1 = + +INTLTOOL_V_MERGE = $(INTLTOOL_V_MERGE_$(V)) +INTLTOOL_V_MERGE_OPTIONS = $(intltool_v_merge_options_$(V)) +INTLTOOL_V_MERGE_ = $(INTLTOOL_V_MERGE_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL_V_MERGE_0 = @echo " ITMRG " $@; +INTLTOOL_V_MERGE_1 = #@discard.mk ------------------------------------------------------------------- rootbin_PROGRAMS = \ @@ -4267,6 +4278,7 @@ tests += \ test-compress-benchmark endif +#@src/libsystemd/Makefile pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -6491,3 +6503,5 @@ 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 - +#@all +include $(topsrcdir)/build-aux/Makefile.tail.mk @@ -131,3 +131,9 @@ set -e done < <(sed -r 's|^if (.*)|ifneq ($(\1),)|' <Makefile.am) rm .tmp.move.all ) + +( + find src \( -name '*.h' -o -name '*.c' \) \ + -exec grep '#include "sd-' -l -- {} + | + xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' +) |