]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
Merge pull request #501 from keszybz/remove-python-systemd
[thirdparty/systemd.git] / Makefile.am
index 5c58e57fc2ff930720a25830ddaa72e04de3e4ba..a8d4d372d3832043fcdd69ee19ccdd05b174d285 100644 (file)
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=8
+LIBSYSTEMD_CURRENT=9
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=8
+LIBSYSTEMD_AGE=9
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -708,10 +708,14 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
 
-update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES)
+# This target should only be run manually. It recreates Makefile-man.am
+# file in the source directory based on all man/*.xml files. Run it after
+# adding, removing, or changing the conditional in a man page.
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
        $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
        @echo "Makefile-man.am has been regenerated"
@@ -3497,7 +3501,6 @@ dist_udevrules_DATA += \
        rules/60-serial.rules \
        rules/64-btrfs.rules \
        rules/70-mouse.rules \
-       rules/70-touchpad.rules \
        rules/75-net-description.rules \
        rules/78-sound-card.rules \
        rules/80-net-setup-link.rules
@@ -3666,8 +3669,7 @@ dist_udevhwdb_DATA = \
        hwdb/60-evdev.hwdb \
        hwdb/60-keyboard.hwdb \
        hwdb/70-mouse.hwdb \
-       hwdb/70-pointingstick.hwdb \
-       hwdb/70-touchpad.hwdb
+       hwdb/70-pointingstick.hwdb
 
 SYSINIT_TARGET_WANTS += \
        systemd-hwdb-update.service
@@ -3802,19 +3804,6 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
        rules/60-persistent-v4l.rules
 
-# ------------------------------------------------------------------------------
-accelerometer_SOURCES = \
-       src/udev/accelerometer/accelerometer.c
-
-accelerometer_LDADD = \
-       libshared.la
-
-udevlibexec_PROGRAMS += \
-       accelerometer
-
-dist_udevrules_DATA += \
-       rules/61-accelerometer.rules
-
 # ------------------------------------------------------------------------------
 mtd_probe_SOURCES =  \
        src/udev/mtd_probe/mtd_probe.c \
@@ -5631,164 +5620,6 @@ EXTRA_DIST += \
        test/loopy.service.d \
        test/loopy.service.d/compat.conf
 
-# ------------------------------------------------------------------------------
-if HAVE_PYTHON_DEVEL
-pkgpyexec_LTLIBRARIES = \
-       _journal.la \
-       id128.la \
-       _daemon.la \
-       _reader.la \
-       login.la
-
-_journal_la_SOURCES = \
-       src/python-systemd/_journal.c
-
-_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-_journal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_journal_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
-
-id128_la_SOURCES = \
-       src/python-systemd/id128.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-nodist_id128_la_SOURCES = \
-       src/python-systemd/id128-constants.h
-
-id128_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS) \
-       -I$(top_builddir)/src/python-systemd
-
-id128_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-id128_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-_daemon_la_SOURCES = \
-       src/python-systemd/_daemon.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS) \
-       -I$(top_builddir)/src/python-systemd
-
-_daemon_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_daemon_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-_reader_la_SOURCES = \
-       src/python-systemd/_reader.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-_reader_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-_reader_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_reader_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-login_la_SOURCES = \
-       src/python-systemd/login.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-login_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-login_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-login_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-dist_pkgpyexec_PYTHON = \
-       src/python-systemd/journal.py \
-       src/python-systemd/daemon.py \
-       src/python-systemd/__init__.py
-
-src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
-
-BUILT_SOURCES += \
-       $(nodist_id128_la_SOURCES)
-
-SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
-sphinx-%:
-       $(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
-       $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
-       $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
-
-python-shell:
-       $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
-       $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
-
-destdir-sphinx: all
-       dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
-               $(MAKE) DESTDIR="$$dir" install && \
-               $(MAKE) DESTDIR="$$dir" sphinx-html && \
-               rm -rf "$$dir"
-
-endif
-
-CLEAN_LOCAL_HOOKS += clean-sphinx
-
-.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
-
-clean-sphinx:
-       -rm -rf docs/html/python-systemd/
-
-# Remove Python stuff, e.g. to force rebuilding for a different Python version.
-clean-python:
-       -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
-       -rm -f _daemon.la id128.la _journal.la login.la _reader.la
-
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
@@ -5961,7 +5792,6 @@ substitutions = \
        '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
        '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
-       '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
@@ -6262,11 +6092,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvrcnd-path=
 endif
 
-if HAVE_PYTHON
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-python
-endif
-
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-split-usr
@@ -6323,7 +6148,6 @@ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 .PHONY: doc-sync
 doc-sync: all destdir-sphinx
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
-       rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
 .PHONY: gardel
 gardel: upload
@@ -6355,7 +6179,7 @@ exported-%: %
        $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
 
 exported: $(addprefix exported-, $(lib_LTLIBRARIES))
-       $(AM_V_GEN)cat $^ > $@
+       $(AM_V_GEN)sort -u $^ > $@
 
 .PHONY: check-api-docs
 check-api-docs: exported man