fix

4 files changed, 22 insertions, 24 deletions

diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 05d928f493..61bf856c96 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -32,14 +32,14 @@ EXTRA_DIST += \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-_libsystemd_la_SOURCES = \
+#libsystemd_la_SOURCES = \
 	$(libsystemd_internal_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES)
 
-_nodist_libsystemd_la_SOURCES = \
+#nodist_libsystemd_la_SOURCES = \
 	$(nodist_libsystemd_internal_la_SOURCES)
 
-libsystemd_la_CFLAGS = \
+#libsystemd_la_CFLAGS = \
 	$(libsystemd_internal_la_CFLAGS) \
 	$(libsystemd_journal_internal_la_CFLAGS)
 
@@ -48,7 +48,7 @@ libsystemd_la_LDFLAGS = \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
 	-Wl,--version-script=$(srcdir)/libsystemd.sym
 
-libsystemd_la_LIBADD = \
+#libsystemd_la_LIBADD = \
 	$(libsystemd_internal_la_LIBADD) \
 	$(libsystemd_journal_internal_la_LIBADD)
 
@@ -90,17 +90,15 @@ tests += \
 	test-local-addresses \
 	test-resolve
 
-test-libsystemd-sym.c: \
-		$(top_builddir)/src/libsystemd/libsystemd.sym \
-		src/systemd/sd-journal.h \
-		src/systemd/sd-daemon.h \
-		src/systemd/sd-login.h \
-		src/systemd/sd-bus.h \
-		src/systemd/sd-utf8.h \
-		src/systemd/sd-resolve.h \
-		src/systemd/sd-path.h \
-		src/systemd/sd-event.h
-	$(generate-sym-test)
+$(outdir)/test-libsystemd-sym.c: \
+		$(srcdir)/include/systemd/sd-journal.h \
+		$(srcdir)/include/systemd/sd-daemon.h \
+		$(srcdir)/include/systemd/sd-login.h \
+		$(srcdir)/include/systemd/sd-bus.h \
+		$(srcdir)/include/systemd/sd-utf8.h \
+		$(srcdir)/include/systemd/sd-resolve.h \
+		$(srcdir)/include/systemd/sd-path.h \
+		$(srcdir)/include/systemd/sd-event.h
 
 nodist_test_libsystemd_sym_SOURCES = \
 	test-libsystemd-sym.c
@@ -108,7 +106,7 @@ test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
 $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym
-at.subdirs += src
-systemd.sed_files += libsystemd.pc
+nested.subdirs += src
+sd.sed_files += libsystemd.pc
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index 3e30a2377b..759c484bc9 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -331,6 +331,6 @@ libsystemd-internal.la.SOURCES =
 libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES)))
 libsystemd-internal.la.SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES))))
 libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo))
-at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES)))
+nested.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES)))
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile
index 7ecfe2b7c8..c9d5c3dcd8 100644
--- a/src/libsystemd/src/sd-journal/Makefile
+++ b/src/libsystemd/src/sd-journal/Makefile
@@ -34,8 +34,8 @@ $(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/include/
 $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
 
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+sd.CPPFLAGS += $(libbasic.CPPFLAGS)
+sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
 $(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/subdir.mk b/src/libsystemd/src/subdir.mk
index 2b0ea2c84f..71691e8dac 100644
--- a/src/libsystemd/src/subdir.mk
+++ b/src/libsystemd/src/subdir.mk
@@ -24,9 +24,9 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+sd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+sd.CPPFLAGS += $(libbasic.CPPFLAGS)
+sd.CPPFLAGS += $(libshared.CPPFLAGS)
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk