chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix pkginclude_HEADERS to what elogind needs and provides.
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 741804814c9b1f82ea66d5d2c6baaa8f4a774c28..bbc6330797bcbad2974957a226a7e459fbb4ef68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=10
-LIBELOGIND_REVISION=2
-LIBELOGIND_AGE=10
+LIBELOGIND_CURRENT=11
+LIBELOGIND_REVISION=0
+LIBELOGIND_AGE=11
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -60,7 +60,6 @@ udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
-udevhwdbdir=$(udevlibexecdir)/hwdb.d
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
@@ -116,8 +115,6 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-       -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -134,8 +131,6 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/systemd \
        -I $(top_builddir)/src/core \
-       -I $(top_srcdir)/src/libudev \
-       -I $(top_srcdir)/src/udev \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libelogind/sd-bus \
        -I $(top_srcdir)/src/libelogind/sd-event \
@@ -194,8 +189,7 @@ dist_doc_DATA = \
        README \
        NEWS \
        LICENSE.LGPL2.1 \
-       LICENSE.GPL2 \
-       DISTRO_PORTING
+       LICENSE.GPL2
 
 @INTLTOOL_POLICY_RULE@
 
@@ -241,18 +235,18 @@ CLEANFILES += \
        docs/html/man
 
 if HAVE_PYTHON
-man/index.html: man/systemd.index.html
-       $(AM_V_LN)$(LN_S) -f systemd.index.html $@
+man/index.html: man/elogind.index.html
+       $(AM_V_LN)$(LN_S) -f elogind.index.html $@
 
 noinst_DATA += \
-       man/index.html
+       man/index.html
 
 CLEANFILES += \
-       man/index.html
+       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))}
+NON_INDEX_XML_FILES = $(filter-out man/elogind.index.xml,$(XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/elogind.directives.xml,$(NON_INDEX_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
@@ -260,22 +254,22 @@ SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directi
 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"
+               @echo "Makefile-man.am has been regenerated"
 
-man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
+man/elogind.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
 
-man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
+man/elogind.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
 
 CLEANFILES += \
-       man/systemd.index.xml \
-       man/systemd.directives.xml
+       man/elogind.index.xml \
+       man/elogind.directives.xml
 
 EXTRA_DIST += \
-       tools/make-man-rules.py
+       tools/make-man-rules.py
 
 endif
 
@@ -362,13 +356,13 @@ libbasic_la_SOURCES = \
        src/basic/fileio-label.c \
        src/basic/fileio-label.h \
        src/basic/rm-rf.c \
-       src/basic/rm-rf.h
+       src/basic/rm-rf.h \
+       src/basic/copy.c \
+       src/basic/copy.h
 
 nodist_libbasic_la_SOURCES = \
        src/basic/errno-from-name.h \
-       src/basic/errno-to-name.h \
-       src/basic/cap-from-name.h \
-       src/basic/cap-to-name.h
+       src/basic/errno-to-name.h
 
 libbasic_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -400,6 +394,7 @@ libshared_la_SOURCES = \
        src/shared/clean-ipc.h \
        src/shared/cgroup-show.c \
        src/shared/cgroup-show.h \
+       src/shared/utmp-wtmp.h \
        src/shared/bus-util.c \
        src/shared/bus-util.h
 
@@ -411,22 +406,15 @@ endif
 
 libshared_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(ACL_CFLAGS) \
-       $(LIBIDN_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(ACL_CFLAGS)
 
 libshared_la_LIBADD = \
        libelogind-internal.la \
        $(UDEV_LIBS) \
-       $(ACL_LIBS) \
-       $(LIBIDN_LIBS) \
-       $(SECCOMP_LIBS)
+       $(ACL_LIBS)
 
 gperf_txt_sources = \
-       src/basic/errno-list.txt \
-       src/basic/af-list.txt \
-       src/basic/arphrd-list.txt \
-       src/basic/cap-list.txt
+       src/basic/errno-list.txt
 
 BUILT_SOURCES += \
        $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf.c) \
@@ -464,44 +452,6 @@ src/basic/errno-to-name.h: src/basic/errno-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
 
-src/basic/af-list.txt:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
-
-src/basic/af-to-name.h: src/basic/af-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-src/basic/arphrd-list.txt:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
-
-src/basic/arphrd-to-name.h: src/basic/arphrd-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-src/basic/arphrd-from-name.gperf: src/basic/arphrd-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
-
-
-src/basic/cap-list.txt:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
-
-src/basic/cap-to-name.h: src/basic/cap-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
-
-src/basic/cap-from-name.gperf: src/basic/cap-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
-
-src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
-
 # ------------------------------------------------------------------------------
 
 if HAVE_PAM
@@ -510,16 +460,6 @@ dist_factory_pam_DATA = \
        factory/etc/pam.d/other
 endif
 
-# ------------------------------------------------------------------------------
-rootlibexec_PROGRAMS += \
-       elogind-cgroups-agent
-
-elogind_cgroups_agent_SOURCES = \
-       src/cgroups-agent/cgroups-agent.c
-
-elogind_cgroups_agent_LDADD = \
-       libshared.la
-
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
        src/systemd/sd-bus.h \
@@ -530,7 +470,6 @@ libelogind_internal_la_SOURCES = \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h \
-       src/systemd/sd-path.h \
        src/libelogind/libelogind.sym \
        src/libelogind/sd-bus/sd-bus.c \
        src/libelogind/sd-bus/bus-control.c \
@@ -575,8 +514,7 @@ libelogind_internal_la_SOURCES = \
        src/libelogind/sd-event/event-util.h \
        src/libelogind/sd-id128/sd-id128.c \
        src/libelogind/sd-daemon/sd-daemon.c \
-       src/libelogind/sd-login/sd-login.c \
-       src/libelogind/sd-path/sd-path.c
+       src/libelogind/sd-login/sd-login.c
 
 libelogind_internal_la_LIBADD = \
        libbasic.la \
@@ -620,13 +558,11 @@ pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       src/systemd/sd-bus.h \
-       src/systemd/sd-bus-protocol.h \
-       src/systemd/sd-bus-vtable.h \
-       src/systemd/sd-event.h \
        src/systemd/sd-login.h \
+       src/systemd/sd-messages.h \
        src/systemd/sd-id128.h \
-       src/systemd/sd-daemon.h
+       src/systemd/_sd-common.h
+
 
 lib_LTLIBRARIES += \
        libelogind.la
@@ -810,9 +746,7 @@ substitutions = \
        '|bindir=$(bindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
        '|pkgdatadir=$(pkgdatadir)|' \
-       '|udevhwdbdir=$(udevhwdbdir)|' \
        '|udevrulesdir=$(udevrulesdir)|' \
-       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -823,18 +757,8 @@ substitutions = \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
-       '|SUSHELL=$(SUSHELL)|' \
-       '|SULOGIN=$(SULOGIN)|' \
-       '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
-       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
-       '|QUOTAON=$(QUOTAON)|' \
-       '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
-       '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
-       '|PYTHON=$(PYTHON)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|'
@@ -977,12 +901,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-       --with-rootprefix=$$dc_install_base \
-       --enable-compat-libs
-
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-sysvinit-path= \
-       --with-sysvrcnd-path=
+       --with-rootprefix=$$dc_install_base
 
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -992,13 +911,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --disable-split-usr
 endif
 
-#
-# Require python when making dist
-#
-.PHONY: dist-check-python dist-check-compat-libs dist-check-help
-dist-check-python:
-
-dist-check-compat-libs:
+.PHONY: dist-check-help
 
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
@@ -1008,7 +921,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
-dist: dist-check-python dist-check-compat-libs
+dist:
 
 .PHONY: git-tag
 git-tag:
@@ -1089,7 +1002,6 @@ test-libelogind-sym.c: \
                src/systemd/sd-daemon.h \
                src/systemd/sd-login.h \
                src/systemd/sd-bus.h \
-               src/systemd/sd-path.h \
                src/systemd/sd-event.h
        $(generate-sym-test)
 
Unnamed repository; edit this file 'description' to name the repository.