summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-13 10:36:02 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-13 10:36:02 -0500
commit06e948901a6f70b4d10c90d05a174da0663d1aba (patch)
tree2c1a82e1252bc1ed09419d43c8cc46263cf186ad /Makefile.am
parent91ba5ac7d0196074863ff08f5251689d324a6550 (diff)
parentdd422d1e5b6a62bc634ae22d0627f70d4900814b (diff)
Merge pull request #2603 from poettering/drop-compat-libs
Some spring cleaning
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am150
1 files changed, 0 insertions, 150 deletions
diff --git a/Makefile.am b/Makefile.am
index badf1ac9ab..676d97c7d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,24 +46,6 @@ LIBSYSTEMD_CURRENT=14
LIBSYSTEMD_REVISION=0
LIBSYSTEMD_AGE=14
-# The following four libraries only exist for compatibility reasons,
-# their version info should not be bumped anymore
-LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=3
-LIBSYSTEMD_LOGIN_AGE=9
-
-LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=12
-LIBSYSTEMD_DAEMON_AGE=0
-
-LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=28
-LIBSYSTEMD_ID128_AGE=0
-
-LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=5
-LIBSYSTEMD_JOURNAL_AGE=11
-
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
@@ -913,8 +895,6 @@ libbasic_la_SOURCES = \
src/basic/audit-util.h \
src/basic/xml.c \
src/basic/xml.h \
- src/basic/json.c \
- src/basic/json.h \
src/basic/barrier.c \
src/basic/barrier.h \
src/basic/async.c \
@@ -1477,7 +1457,6 @@ tests += \
test-tables \
test-device-nodes \
test-xml \
- test-json \
test-architecture \
test-socket-util \
test-fdset \
@@ -1931,12 +1910,6 @@ test_xml_SOURCES = \
test_xml_LDADD = \
libshared.la
-test_json_SOURCES = \
- src/test/test-json.c
-
-test_json_LDADD = \
- libshared.la
-
test_list_SOURCES = \
src/test/test-list.c
@@ -5045,8 +5018,6 @@ systemd_pull_SOURCES = \
src/import/import-compress.h \
src/import/curl-util.c \
src/import/curl-util.h \
- src/import/aufs-util.c \
- src/import/aufs-util.h \
src/import/qcow2-util.c \
src/import/qcow2-util.h
@@ -5802,127 +5773,6 @@ EXTRA_DIST += \
test/loopy.service.d/compat.conf
# ------------------------------------------------------------------------------
-if ENABLE_COMPAT_LIBS
-libsystemd-%.c: src/compat-libs/libsystemd-%.sym
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@
-
-BUILT_SOURCES += \
- libsystemd-journal.c \
- libsystemd-login.c \
- libsystemd-id128.c \
- libsystemd-daemon.c
-
-nodist_libsystemd_journal_la_SOURCES = \
- libsystemd-journal.c
-
-libsystemd_journal_la_SOURCES = \
- src/compat-libs/libsystemd-journal.sym
-
-libsystemd_journal_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_journal_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
-
-libsystemd_journal_la_LIBADD = \
- libsystemd-journal-internal.la \
- libsystemd-internal.la
-
-nodist_libsystemd_login_la_SOURCES = \
- libsystemd-login.c
-
-libsystemd_login_la_SOURCES = \
- src/compat-libs/libsystemd-login.sym
-
-libsystemd_login_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_login_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
-
-libsystemd_login_la_LIBADD = \
- libsystemd-internal.la
-
-nodist_libsystemd_id128_la_SOURCES = \
- libsystemd-id128.c
-
-libsystemd_id128_la_SOURCES = \
- src/compat-libs/libsystemd-id128.sym
-
-libsystemd_id128_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_id128_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
-
-libsystemd_id128_la_LIBADD = \
- libsystemd-internal.la
-
-nodist_libsystemd_daemon_la_SOURCES = \
- libsystemd-daemon.c
-
-libsystemd_daemon_la_SOURCES = \
- src/compat-libs/libsystemd-daemon.sym
-
-libsystemd_daemon_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_daemon_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
-
-libsystemd_daemon_la_LIBADD = \
- libsystemd-internal.la
-
-lib_LTLIBRARIES += \
- libsystemd-journal.la \
- libsystemd-login.la \
- libsystemd-id128.la \
- libsystemd-daemon.la
-
-pkgconfiglib_DATA += \
- src/compat-libs/libsystemd-journal.pc \
- src/compat-libs/libsystemd-login.pc \
- src/compat-libs/libsystemd-id128.pc \
- src/compat-libs/libsystemd-daemon.pc
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-compat-lib-install-hook:
- libname=libsystemd-login.so && $(move-to-rootlibdir)
- libname=libsystemd-journal.so && $(move-to-rootlibdir)
- libname=libsystemd-id128.so && $(move-to-rootlibdir)
- libname=libsystemd-daemon.so && $(move-to-rootlibdir)
-
-compat-lib-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-INSTALL_EXEC_HOOKS += compat-lib-install-hook
-UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
-endif
-
-EXTRA_DIST += \
- src/compat-libs/linkwarning.h \
- src/compat-libs/libsystemd-journal.pc.in \
- src/compat-libs/libsystemd-login.pc.in \
- src/compat-libs/libsystemd-id128.pc.in \
- src/compat-libs/libsystemd-daemon.pc.in
-
-# ------------------------------------------------------------------------------
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \