diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 18:48:01 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 18:48:01 -0400 |
| commit | 7b5516edb2acfc4ef6a48c5044eb4263eb9a3ad3 (patch) | |
| tree | ac0460406a1a7c1dba4ef1002fa632e12321ae47 /src/libsystemd/libsystemd-internal | |
| parent | 534754b0800a464247496f8c49948381797d9afb (diff) | |
stuff
Diffstat (limited to 'src/libsystemd/libsystemd-internal')
| -rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 20 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-internal/subdir.mk | 11 |
2 files changed, 19 insertions, 12 deletions
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 38115c9108..3d65f0ea11 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -114,19 +114,23 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-resolve/sd-resolve.c libsystemd_internal_la_LIBADD = \ - libbasic.la \ + $(topoutdir)/src/libbasic/libbasic.la \ -lresolv noinst_LTLIBRARIES += \ libsystemd-internal.la +automake_sources = $(patsubst src/libsystemd/%,$(outdir)/%,$(filter %.c,$($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) $(eval $(value automake2autothing)) -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)))) -$(outdir)/libsystemd-internal.la: \ - $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \ - $(libbasic.DEPENDS) -lresolv +_subdirs := $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la))) +automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) + +at.subdirs += $(_subdirs) + +AM_CPPFLAGS += $(libsystemd.CPPFLAGS) +AM_CPPFLAGS += $(libbasic.CPPFLAGS) +AM_CPPFLAGS += $(libshared.CPPFLAGS) +AM_CPPFLAGS += -DLIBDIR=\"$(libdir)\" +AM_CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk index 69eb85a4d7..96b7145434 100644 --- a/src/libsystemd/libsystemd-internal/subdir.mk +++ b/src/libsystemd/libsystemd-internal/subdir.mk @@ -1,7 +1,10 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk -include $(topsrcdir)/automake.head.mk +include $(topsrcdir)/build-aux/Makefile.head.mk -#CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) -#CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +AM_CPPFLAGS += $(libsystemd.CPPFLAGS) +AM_CPPFLAGS += $(libbasic.CPPFLAGS) +AM_CPPFLAGS += $(libshared.CPPFLAGS) +AM_CPPFLAGS += -DLIBDIR=\"$(libdir)\" +AM_CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" -include $(topsrcdir)/automake.tail.mk +include $(topsrcdir)/build-aux/Makefile.tail.mk |