X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=2a4255ad69371e7353fc9a0623e599c9e3f8e693;hb=aead9bd04191188f78f2565e0d9d25c586bdbf99;hp=8992f4a69ce65657683d96e70eb028b7d9c8fef2;hpb=bd1ce0bdbfc97a958a6c56fe062bed892f08444a;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 8992f4a69..2a4255ad6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -194,8 +194,7 @@ dist_doc_DATA = \ README \ NEWS \ LICENSE.LGPL2.1 \ - LICENSE.GPL2 \ - DISTRO_PORTING + LICENSE.GPL2 @INTLTOOL_POLICY_RULE@ @@ -241,18 +240,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 +259,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 +361,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 +399,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 @@ -423,10 +423,7 @@ libshared_la_LIBADD = \ $(SECCOMP_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 +461,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 - $@ - -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 - $@ - -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 - $@ - -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 @@ -832,7 +791,6 @@ substitutions = \ '|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)|' \ @@ -980,10 +938,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-rootprefix=$$dc_install_base \ --enable-compat-libs -DISTCHECK_CONFIGURE_FLAGS += \ - --with-sysvinit-path= \ - --with-sysvrcnd-path= - if ENABLE_SPLIT_USR DISTCHECK_CONFIGURE_FLAGS += \ --enable-split-usr @@ -992,12 +946,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: - +.PHONY: dist-check-compat-libs dist-check-help dist-check-compat-libs: dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) @@ -1008,7 +957,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) exit 1; \ fi; done -dist: dist-check-python dist-check-compat-libs +dist: dist-check-compat-libs .PHONY: git-tag git-tag: