From 658d4fefc78a50ad825f95f55f640a2a97134f80 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 27 May 2016 15:32:35 -0400
Subject: stuff

---
 common.once.head.mk | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

(limited to 'common.once.head.mk')

diff --git a/common.once.head.mk b/common.once.head.mk
index 7aff19a067..9412d3cb9c 100644
--- a/common.once.head.mk
+++ b/common.once.head.mk
@@ -20,16 +20,20 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-AM_MAKEFLAGS = --no-print-directory
-AUTOMAKE_OPTIONS = color-tests parallel-tests
+AM_CPPFLAGS     = @OUR_CPPFLAGS@
+AM_CFLAGS       = @OUR_CFLAGS@
+AM_LDFLAGS      = @OUR_LDFLAGS@
+AM_LIBTOOLFLAGS = 
 
-GCC_COLORS ?= 'ooh, shiny!'
-export GCC_COLORS
+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))
 
-SUBDIRS = . po
+AM_CPPFLAGS += -include $(topoutdir)/config.h
 
-CPPFLAGS += -include $(topoutdir)/config.h
+GCC_COLORS ?= 'ooh, shiny!'
+export GCC_COLORS
 
 # remove targets if the command fails
 .DELETE_ON_ERROR:
@@ -60,14 +64,25 @@ define generate-sym-test
 	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
-# from GNU automake
 
-DEFAULT_INCLUDES = -I.
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-DEPDIR = .deps
+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
 
-am__mv = mv -f
+$(topoutdir)/config.mk: $(topoutdir)/config.status $(topsrcdir)/config.mk.in
+	cd $(topoutdir) && ./config.status
 
 include $(topsrcdir)/am-pretty.mk
 include $(topsrcdir)/am-tools.mk
-- 
cgit v1.2.3-54-g00ecf