X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=e5197a56cacbe8d37ded38cb597795fdf51198fd;hb=0b1fef380e547ee2b720993c04845c04806a44e5;hp=4aa490ad1c9cd43769284f41bb544c3c69e70873;hpb=43c16e732da84dca51253c78f2c41ed633eee247;p=people%2Fms%2Flibloc.git diff --git a/Makefile.am b/Makefile.am index 4aa490a..e5197a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ AM_CFLAGS = ${my_CFLAGS} \ -ffunction-sections \ -fdata-sections -AM_LDFLAGS = +AM_LDFLAGS = ${my_LDFLAGS} # leaving a space here to work around automake's conditionals ifeq ($(OS),Darwin) @@ -33,8 +33,8 @@ AM_LDFLAGS = -Wl,--gc-sections endif -LIBLOC_CURRENT=0 -LIBLOC_REVISION=0 +LIBLOC_CURRENT=1 +LIBLOC_REVISION=1 LIBLOC_AGE=0 DISTCHECK_CONFIGURE_FLAGS = \ @@ -51,9 +51,12 @@ SED_PROCESS = \ -e 's,@databasedir\@,$(databasedir),g' \ < $< > $@ || rm $@ -databasedir = $(datadir)/location +databasedir = $(localstatedir)/lib/location pkgconfigdir = $(libdir)/pkgconfig +# Overwrite Python path +pkgpythondir = $(pythondir)/location + %: %.in Makefile $(SED_PROCESS) @@ -72,25 +75,36 @@ AM_V_XSLT_0 = @echo " XSLT " $@; # ------------------------------------------------------------------------------ .PHONY: update-po -update-po: +update-po: po/POTFILES.in $(MAKE) -C po update-po +po/POTFILES.in: Makefile + find $(abs_srcdir)/src -type f \( -name '*.in' -o -name '*.py' \) \ + \! -exec git check-ignore -q {} \; -print | \ + sed -e "s@$(abs_srcdir)/@@g" | LC_ALL=C sort > $@ + EXTRA_DIST += \ + examples/private-key.pem \ + examples/public-key.pem \ examples/python/create-database.py \ examples/python/read-database.py pkginclude_HEADERS = \ - src/loc/libloc.h \ - src/loc/as.h \ - src/loc/compat.h \ - src/loc/country.h \ - src/loc/database.h \ - src/loc/format.h \ - src/loc/network.h \ - src/loc/private.h \ - src/loc/stringpool.h \ - src/loc/resolv.h \ - src/loc/writer.h + src/libloc/libloc.h \ + src/libloc/address.h \ + src/libloc/as.h \ + src/libloc/as-list.h \ + src/libloc/compat.h \ + src/libloc/country.h \ + src/libloc/country-list.h \ + src/libloc/database.h \ + src/libloc/format.h \ + src/libloc/network.h \ + src/libloc/network-list.h \ + src/libloc/private.h \ + src/libloc/stringpool.h \ + src/libloc/resolv.h \ + src/libloc/writer.h lib_LTLIBRARIES = \ src/libloc.la @@ -98,9 +112,12 @@ lib_LTLIBRARIES = \ src_libloc_la_SOURCES = \ src/libloc.c \ src/as.c \ + src/as-list.c \ src/country.c \ + src/country-list.c \ src/database.c \ src/network.c \ + src/network-list.c \ src/resolv.c \ src/stringpool.c \ src/writer.c @@ -123,11 +140,30 @@ src_libloc_la_LDFLAGS += -export-symbols $(top_srcdir)/src/libloc.sym endif src_libloc_la_LIBADD = \ + $(OPENSSL_LIBS) \ $(RESOLV_LIBS) src_libloc_la_DEPENDENCIES = \ ${top_srcdir}/src/libloc.sym +noinst_LTLIBRARIES = \ + src/libloc-internal.la + +src_libloc_internal_la_SOURCES = \ + $(src_libloc_la_SOURCES) + +src_libloc_internal_la_CFLAGS = \ + $(src_libloc_la_CFLAGS) + +src_libloc_internal_la_LDFLAGS = \ + $(filter-out -version-info %,$(src_libloc_la_LDFLAGS)) + +src_libloc_internal_la_LIBADD = \ + $(src_libloc_la_LIBADD) + +src_libloc_internal_la_DEPENDENCIES = \ + $(src_libloc_la_DEPENDENCIES) + pkgconfig_DATA = \ src/libloc.pc @@ -137,10 +173,27 @@ EXTRA_DIST += \ CLEANFILES += \ src/libloc.pc +dist_pkgpython_PYTHON = \ + src/python/database.py \ + src/python/downloader.py \ + src/python/export.py \ + src/python/i18n.py \ + src/python/importer.py \ + src/python/logger.py + +pkgpython_PYTHON = \ + src/python/__init__.py + +EXTRA_DIST += \ + src/python/__init__.py.in + +CLEANFILES += \ + src/python/__init__.py + pyexec_LTLIBRARIES = \ - src/python/location.la + src/python/_location.la -src_python_location_la_SOURCES = \ +src_python__location_la_SOURCES = \ src/python/locationmodule.c \ src/python/locationmodule.h \ src/python/as.c \ @@ -154,17 +207,17 @@ src_python_location_la_SOURCES = \ src/python/writer.c \ src/python/writer.h -src_python_location_la_CFLAGS = \ +src_python__location_la_CFLAGS = \ $(AM_CFLAGS) \ $(PYTHON_CFLAGS) -src_python_location_la_LDFLAGS = \ +src_python__location_la_LDFLAGS = \ $(AM_LDFLAGS) \ -shared \ -module \ -avoid-version -src_python_location_la_LIBADD = \ +src_python__location_la_LIBADD = \ src/libloc.la \ $(PYTHON_LIBS) @@ -201,11 +254,12 @@ build-perl: .PHONY: check-perl check-perl: testdata.db - cd $(builddir)/src/perl && $(MAKE) test database="../../$<" + cd $(builddir)/src/perl && $(MAKE) LD_LIBRARY_PATH="$(abs_builddir)/src/.libs" test \ + database="../../$<" keyfile="$(abs_srcdir)/examples/public-key.pem" .PHONY: install-perl install-perl: - cd $(builddir)/src/perl && $(MAKE) install + cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR) .PHONY: clean-perl clean-perl: @@ -220,22 +274,23 @@ uninstall-perl: $(DESTDIR)/$(prefix)/man/man3/Location.3pm bin_SCRIPTS = \ - src/python/location-downloader \ - src/python/location-query + src/python/location \ + src/python/location-importer EXTRA_DIST += \ - src/python/location-downloader.in \ - src/python/location-query.in + src/python/location.in \ + src/python/location-importer.in CLEANFILES += \ - src/python/location-downloader \ - src/python/location-query + src/python/location \ + src/python/location-importer + # ------------------------------------------------------------------------------ if HAVE_SYSTEMD systemdsystemunit_DATA = \ - src/systemd/location-downloader.service \ - src/systemd/location-downloader.timer + src/systemd/location-update.service \ + src/systemd/location-update.timer CLEANFILES += \ $(systemdsystemunit_DATA) @@ -245,14 +300,24 @@ INSTALL_DIRS += \ endif EXTRA_DIST += \ - src/systemd/location-downloader.service.in \ - src/systemd/location-downloader.timer.in + src/systemd/location-update.service.in \ + src/systemd/location-update.timer.in + +# ------------------------------------------------------------------------------ + +dist_database_DATA = \ + src/signing-key.pem # ------------------------------------------------------------------------------ TESTS_CFLAGS = \ $(AM_CFLAGS) \ - -DLIBLOC_PRIVATE + -DLIBLOC_PRIVATE \ + -DABS_SRCDIR=\"$(abs_srcdir)\" + +TESTS_LDADD = \ + src/libloc.la \ + src/libloc-internal.la TESTS = \ src/test-libloc \ @@ -260,14 +325,16 @@ TESTS = \ src/test-database \ src/test-as \ src/test-network \ - src/test-country + src/test-country \ + src/test-signature CLEANFILES += \ - test.db \ testdata.db testdata.db: examples/python/create-database.py - PYTHONPATH=$(abs_builddir)/src/python/.libs $(PYTHON) $< $@ + PYTHONPATH=$(abs_builddir)/src/python/.libs \ + ABS_SRCDIR="$(abs_srcdir)" \ + $(PYTHON) $< $@ check_PROGRAMS = \ src/test-libloc \ @@ -275,7 +342,9 @@ check_PROGRAMS = \ src/test-database \ src/test-as \ src/test-network \ - src/test-country + src/test-network-list \ + src/test-country \ + src/test-signature src_test_libloc_SOURCES = \ src/test-libloc.c @@ -284,7 +353,7 @@ src_test_libloc_CFLAGS = \ $(TESTS_CFLAGS) src_test_libloc_LDADD = \ - src/libloc.la + $(TESTS_LDADD) src_test_as_SOURCES = \ src/test-as.c @@ -293,7 +362,7 @@ src_test_as_CFLAGS = \ $(TESTS_CFLAGS) src_test_as_LDADD = \ - src/libloc.la + $(TESTS_LDADD) src_test_country_SOURCES = \ src/test-country.c @@ -302,7 +371,7 @@ src_test_country_CFLAGS = \ $(TESTS_CFLAGS) src_test_country_LDADD = \ - src/libloc.la + $(TESTS_LDADD) src_test_network_SOURCES = \ src/test-network.c @@ -311,7 +380,16 @@ src_test_network_CFLAGS = \ $(TESTS_CFLAGS) src_test_network_LDADD = \ - src/libloc.la + $(TESTS_LDADD) + +src_test_network_list_SOURCES = \ + src/test-network-list.c + +src_test_network_list_CFLAGS = \ + $(TESTS_CFLAGS) + +src_test_network_list_LDADD = \ + $(TESTS_LDADD) src_test_stringpool_SOURCES = \ src/test-stringpool.c @@ -320,7 +398,7 @@ src_test_stringpool_CFLAGS = \ $(TESTS_CFLAGS) src_test_stringpool_LDADD = \ - src/libloc.la + $(TESTS_LDADD) src_test_database_SOURCES = \ src/test-database.c @@ -329,22 +407,48 @@ src_test_database_CFLAGS = \ $(TESTS_CFLAGS) src_test_database_LDADD = \ - src/libloc.la + $(TESTS_LDADD) + +src_test_signature_SOURCES = \ + src/test-signature.c + +src_test_signature_CFLAGS = \ + $(TESTS_CFLAGS) + +src_test_signature_LDADD = \ + $(TESTS_LDADD) # ------------------------------------------------------------------------------ MANPAGES = \ - man/location-downloader.8 \ - man/location-query.8 - -MANPAGES_TXT = $(patsubst %.8,%.txt,$(MANPAGES)) -MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT)) -MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT)) + $(MANPAGES_3) \ + $(MANPAGES_8) + +MANPAGES_3 = \ + man/libloc.3 \ + man/loc_database_count_as.3 \ + man/loc_database_get_as.3 \ + man/loc_database_get_country.3 \ + man/loc_database_lookup.3 \ + man/loc_database_new.3 \ + man/loc_get_log_priority.3 \ + man/loc_new.3 \ + man/loc_set_log_fn.3 \ + man/loc_set_log_priority.3 + +MANPAGES_8 = \ + man/location.8 + +MANPAGES_TXT = $(MANPAGES_TXT_3) $(MANPAGES_TXT_8) +MANPAGES_TXT_3 = $(patsubst %.3,%.txt,$(MANPAGES_3)) +MANPAGES_TXT_8 = $(patsubst %.8,%.txt,$(MANPAGES_8)) +MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT)) +MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT)) .PHONY: man man: $(MANPAGES) $(MANPAGES_HTML) -if ENABLE_MANPAGES +if ENABLE_MAN_PAGES man_MANS = \ $(MANPAGES) endif @@ -382,6 +486,9 @@ man/%.xml: man/%.txt man/asciidoc.conf -f $(abs_srcdir)/man/asciidoc.conf \ -d manpage -b docbook -o $@ $< +man/%.3: man/%.xml + $(XSLTPROC_COMMAND_MAN) + man/%.8: man/%.xml $(XSLTPROC_COMMAND_MAN) @@ -394,3 +501,21 @@ man/%.html: man/%.txt man/asciidoc.conf .PHONY: upload-man upload-man: $(MANPAGES_HTML) rsync -avHz --delete --progress $(MANPAGES_HTML) ms@fs01.haj.ipfire.org:/pub/man-pages/$(PACKAGE_NAME)/ + +EXTRA_DIST += \ + debian/build.sh \ + debian/changelog \ + debian/compat \ + debian/control \ + debian/copyright \ + debian/location.install \ + debian/location.manpages \ + debian/location-python.install \ + debian/libloc1.install \ + debian/libloc-dev.install \ + debian/rules \ + debian/source/format + +.PHONY: debian +debian: dist + $(SHELL) debian/build.sh $(PACKAGE_NAME)-$(PACKAGE_VERSION) $(distdir).tar.xz