diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-31 12:16:03 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-31 12:16:03 -0400 |
| commit | 796cdb6effad1c36d4b861c1fe3917d26f23a968 (patch) | |
| tree | 99be1478a79255d7cddc94fa416c964be22ad3bd | |
| parent | f5828cc5def25fa4121c2e432cdd2178400d3c38 (diff) | |
tidy up
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rwxr-xr-x | tools/notsd-move | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 915526fec9..bb5c03721d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -363,21 +363,25 @@ AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) AM_V_M4_0 = @echo " M4 " $@; AM_V_M4_1 = +#@build-aux/Makefile.once.head/20-sdman.mk 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 = +#@build-aux/Makefile.once.head/20-sd.mk 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 = +#@build-aux/Makefile.once.head/20-sdman.mk 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 = +#@build-aux/Makefile.once.head/20-sd.mk AM_V_RM = $(AM_V_RM_$(V)) AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) AM_V_RM_0 = @echo " RM " $@; @@ -747,7 +751,7 @@ EXTRA_DIST += \ @INTLTOOL_POLICY_RULE@ -#@build-aux/Makefile.each.tail/70-man.mk --------------------------------------- +#@build-aux/Makefile.each.tail/70-sdman.mk ------------------------------------- MANPAGES = MANPAGES_ALIAS = @@ -6373,7 +6377,7 @@ man/custom-entities.ent: configure.ac CLEANFILES += \ man/custom-entities.ent -#@build-aux/Makefile.once.head/20-sd.mk +#@build-aux/Makefile.once.head/20-sdman.mk XSLTPROC_FLAGS = \ --nonet \ --xinclude \ @@ -6391,7 +6395,7 @@ XSLTPROC_PROCESS_MAN = \ XSLTPROC_PROCESS_HTML = \ $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< -#@build-aux/Makefile.each.tail/50-sd.mk +#@build-aux/Makefile.each.tail/70-sdman.mk man/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent $(XSLTPROC_PROCESS_MAN) @@ -6410,7 +6414,7 @@ man/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent man/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent $(XSLTPROC_PROCESS_HTML) -#@build-aux/Makefile.once.head/20-sd.mk +#@build-aux/Makefile.once.head/20-sdman.mk define html-alias $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ endef diff --git a/tools/notsd-move b/tools/notsd-move index 36ca546a63..096c3d8338 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -786,6 +786,7 @@ fixup_makefile() { -e 's|^if (.*)|ifneq ($(\1),)|' \ -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \ -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' \ + -e 's|\$\((lib\S+)_la_LIBADD\)|\1.la|g' \ \ -e '#### Rename helpers ################' \ -e 's|libbasic_la|libsystemd_basic_la|g' \ |