libsystemd-id128: restructure Makefile.am
This commit is contained in:
parent
7e8f489ad5
commit
d4a66a7f96
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,5 +1,4 @@
|
||||||
/systemd-rc-local-generator
|
/systemd-rc-local-generator
|
||||||
/libsystemd-journal.pc
|
|
||||||
/libsystemd-id128.pc
|
/libsystemd-id128.pc
|
||||||
systemd-journalctl
|
systemd-journalctl
|
||||||
systemd-journald
|
systemd-journald
|
||||||
|
|
113
Makefile.am
113
Makefile.am
|
@ -207,12 +207,10 @@ systemgenerator_PROGRAMS += \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
lib_LTLIBRARIES = \
|
lib_LTLIBRARIES = \
|
||||||
libsystemd-daemon.la \
|
libsystemd-daemon.la
|
||||||
libsystemd-id128.la
|
|
||||||
|
|
||||||
pkginclude_HEADERS = \
|
pkginclude_HEADERS = \
|
||||||
src/sd-daemon.h \
|
src/sd-daemon.h
|
||||||
src/sd-id128.h
|
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
test-engine \
|
test-engine \
|
||||||
|
@ -224,8 +222,7 @@ noinst_PROGRAMS = \
|
||||||
test-cgroup \
|
test-cgroup \
|
||||||
test-env-replace \
|
test-env-replace \
|
||||||
test-strv \
|
test-strv \
|
||||||
test-install \
|
test-install
|
||||||
test-id128
|
|
||||||
|
|
||||||
if HAVE_PAM
|
if HAVE_PAM
|
||||||
pamlib_LTLIBRARIES = \
|
pamlib_LTLIBRARIES = \
|
||||||
|
@ -413,9 +410,7 @@ EXTRA_DIST += \
|
||||||
units/user@.service.in \
|
units/user@.service.in \
|
||||||
systemd.pc.in \
|
systemd.pc.in \
|
||||||
libsystemd-daemon.pc.in \
|
libsystemd-daemon.pc.in \
|
||||||
libsystemd-id128.pc.in \
|
|
||||||
src/libsystemd-daemon.sym \
|
src/libsystemd-daemon.sym \
|
||||||
src/libsystemd-id128.sym \
|
|
||||||
introspect.awk \
|
introspect.awk \
|
||||||
src/73-seat-late.rules.in \
|
src/73-seat-late.rules.in \
|
||||||
src/99-systemd.rules.in \
|
src/99-systemd.rules.in \
|
||||||
|
@ -493,8 +488,7 @@ pkgconfigdata_DATA = \
|
||||||
systemd.pc
|
systemd.pc
|
||||||
|
|
||||||
pkgconfiglib_DATA = \
|
pkgconfiglib_DATA = \
|
||||||
libsystemd-daemon.pc \
|
libsystemd-daemon.pc
|
||||||
libsystemd-id128.pc
|
|
||||||
|
|
||||||
# First passed through sed, followed by intltool
|
# First passed through sed, followed by intltool
|
||||||
polkitpolicy_in_in_files = \
|
polkitpolicy_in_in_files = \
|
||||||
|
@ -855,16 +849,6 @@ test_install_CFLAGS = \
|
||||||
test_install_LDADD = \
|
test_install_LDADD = \
|
||||||
libsystemd-basic.la
|
libsystemd-basic.la
|
||||||
|
|
||||||
test_id128_SOURCES = \
|
|
||||||
src/test-id128.c \
|
|
||||||
src/sd-id128.c
|
|
||||||
|
|
||||||
test_id128_CFLAGS = \
|
|
||||||
$(AM_CFLAGS)
|
|
||||||
|
|
||||||
test_id128_LDADD = \
|
|
||||||
libsystemd-basic.la
|
|
||||||
|
|
||||||
systemd_stdout_syslog_bridge_SOURCES = \
|
systemd_stdout_syslog_bridge_SOURCES = \
|
||||||
src/stdout-syslog-bridge.c \
|
src/stdout-syslog-bridge.c \
|
||||||
src/tcpwrap.c
|
src/tcpwrap.c
|
||||||
|
@ -928,6 +912,67 @@ dist_pkgdata_DATA = \
|
||||||
dist_noinst_SCRIPT = \
|
dist_noinst_SCRIPT = \
|
||||||
src/generate-kbd-model-map
|
src/generate-kbd-model-map
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
libsystemd_id128_la_SOURCES = \
|
||||||
|
src/sd-id128.c
|
||||||
|
|
||||||
|
libsystemd_id128_la_CFLAGS = \
|
||||||
|
$(AM_CFLAGS) \
|
||||||
|
-fvisibility=hidden
|
||||||
|
|
||||||
|
libsystemd_id128_la_LDFLAGS = \
|
||||||
|
-shared \
|
||||||
|
-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
|
||||||
|
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
|
||||||
|
|
||||||
|
libsystemd_id128_la_LIBADD = \
|
||||||
|
libsystemd-basic.la
|
||||||
|
|
||||||
|
test_id128_SOURCES = \
|
||||||
|
src/test-id128.c \
|
||||||
|
src/sd-id128.c
|
||||||
|
|
||||||
|
test_id128_CFLAGS = \
|
||||||
|
$(AM_CFLAGS)
|
||||||
|
|
||||||
|
test_id128_LDADD = \
|
||||||
|
libsystemd-basic.la
|
||||||
|
|
||||||
|
noinst_PROGRAMS += \
|
||||||
|
test-id128
|
||||||
|
|
||||||
|
pkginclude_HEADERS += \
|
||||||
|
src/sd-id128.h
|
||||||
|
|
||||||
|
lib_LTLIBRARIES += \
|
||||||
|
libsystemd-id128.la
|
||||||
|
|
||||||
|
pkgconfiglib_DATA += \
|
||||||
|
libsystemd-id128.pc
|
||||||
|
|
||||||
|
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
|
||||||
|
libsystemd-id128-install-hook:
|
||||||
|
if test "$(libdir)" != "$(rootlibdir)"; then \
|
||||||
|
mkdir -p $(DESTDIR)$(rootlibdir) && \
|
||||||
|
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
|
||||||
|
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
|
||||||
|
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
|
||||||
|
mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
|
||||||
|
fi
|
||||||
|
|
||||||
|
INSTALL_EXEC_HOOKS += \
|
||||||
|
libsystemd-id128-install-hook
|
||||||
|
|
||||||
|
libsystemd-id128-uninstall-hook:
|
||||||
|
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
|
||||||
|
|
||||||
|
UNINSTALL_EXEC_HOOKS += \
|
||||||
|
libsystemd-id128-uninstall-hook
|
||||||
|
|
||||||
|
EXTRA_DIST += \
|
||||||
|
libsystemd-id128.pc.in \
|
||||||
|
src/libsystemd-id128.sym
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
systemd_journald_SOURCES = \
|
systemd_journald_SOURCES = \
|
||||||
src/journal/journald.c \
|
src/journal/journald.c \
|
||||||
|
@ -1887,34 +1932,6 @@ libsystemd-daemon-install-hook:
|
||||||
libsystemd-daemon-uninstall-hook:
|
libsystemd-daemon-uninstall-hook:
|
||||||
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
|
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
|
||||||
|
|
||||||
libsystemd_id128_la_SOURCES = \
|
|
||||||
src/sd-id128.c
|
|
||||||
|
|
||||||
libsystemd_id128_la_CFLAGS = \
|
|
||||||
$(AM_CFLAGS) \
|
|
||||||
-fvisibility=hidden
|
|
||||||
|
|
||||||
libsystemd_id128_la_LDFLAGS = \
|
|
||||||
-shared \
|
|
||||||
-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
|
|
||||||
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
|
|
||||||
|
|
||||||
libsystemd_id128_la_LIBADD = \
|
|
||||||
libsystemd-basic.la
|
|
||||||
|
|
||||||
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
|
|
||||||
libsystemd-id128-install-hook:
|
|
||||||
if test "$(libdir)" != "$(rootlibdir)"; then \
|
|
||||||
mkdir -p $(DESTDIR)$(rootlibdir) && \
|
|
||||||
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
|
|
||||||
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
|
|
||||||
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
|
|
||||||
mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
|
|
||||||
fi
|
|
||||||
|
|
||||||
libsystemd-id128-uninstall-hook:
|
|
||||||
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
|
|
||||||
|
|
||||||
SED_PROCESS = \
|
SED_PROCESS = \
|
||||||
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
||||||
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
|
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
|
||||||
|
|
1
src/journal/.gitignore
vendored
Normal file
1
src/journal/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
libsystemd-journal.pc
|
Loading…
Reference in a new issue