X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=ebd7e1771c896d479c9a1be0439e94803d86190c;hb=5dacb45afceac2d05ea597755c1ca5a1b62cc0fd;hp=6f4a8c969a1fe873a3f6e0310cbeb176b9ea2c1a;hpb=e44b30f4e3409c0c68fd82e8b9618e5fc4b3e0e9;p=people%2Fms%2Flibloc.git diff --git a/Makefile.am b/Makefile.am index 6f4a8c9..ebd7e17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,11 +9,6 @@ BINDINGS = OS = $(shell uname -s) -DEBIAN_TARBALL_NAME = $(PACKAGE_NAME)_$(PACKAGE_VERSION).orig.tar.xz - -CLEANFILES += \ - $(DEBIAN_TARBALL_NAME) - if ENABLE_PERL BINDINGS += perl endif @@ -38,7 +33,7 @@ AM_LDFLAGS = -Wl,--gc-sections endif -LIBLOC_CURRENT=0 +LIBLOC_CURRENT=1 LIBLOC_REVISION=0 LIBLOC_AGE=0 @@ -59,10 +54,6 @@ SED_PROCESS = \ databasedir = $(localstatedir)/lib/location pkgconfigdir = $(libdir)/pkgconfig -# XXX hardcode path for Debian -pythondir = $(prefix)/lib/python3/dist-packages -pyexecdir = $(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload - # Overwrite Python path pkgpythondir = $(pythondir)/location @@ -84,9 +75,13 @@ 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 | \ + grep -E "\.(in|py)$$" | sed -e "s@$(abs_srcdir)/@@g" | sort > $@ + EXTRA_DIST += \ examples/private-key.pem \ examples/public-key.pem \ @@ -96,11 +91,14 @@ EXTRA_DIST += \ pkginclude_HEADERS = \ src/loc/libloc.h \ src/loc/as.h \ + src/loc/as-list.h \ src/loc/compat.h \ src/loc/country.h \ + src/loc/country-list.h \ src/loc/database.h \ src/loc/format.h \ src/loc/network.h \ + src/loc/network-list.h \ src/loc/private.h \ src/loc/stringpool.h \ src/loc/resolv.h \ @@ -112,9 +110,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 @@ -153,9 +154,22 @@ CLEANFILES += \ src/libloc.pc dist_pkgpython_PYTHON = \ - src/python/__init__.py \ + 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 @@ -216,7 +230,7 @@ build-perl: cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \ INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" - cd $(builddir)/src/perl && $(MAKE) LD_RUN_PATH= + cd $(builddir)/src/perl && $(MAKE) CC="$(CC)" LD="$(LD)" LD_RUN_PATH= .PHONY: check-perl check-perl: testdata.db @@ -240,26 +254,23 @@ uninstall-perl: $(DESTDIR)/$(prefix)/man/man3/Location.3pm bin_SCRIPTS = \ - src/python/location-downloader \ - src/python/location-exporter \ - src/python/location-query + src/python/location \ + src/python/location-importer EXTRA_DIST += \ - src/python/location-downloader.in \ - src/python/location-exporter.in \ - src/python/location-query.in + src/python/location.in \ + src/python/location-importer.in CLEANFILES += \ - src/python/location-downloader \ - src/python/location-exporter \ - 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) @@ -269,8 +280,8 @@ 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 # ------------------------------------------------------------------------------ @@ -290,10 +301,10 @@ 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 @@ -307,6 +318,7 @@ check_PROGRAMS = \ src/test-database \ src/test-as \ src/test-network \ + src/test-network-list \ src/test-country \ src/test-signature @@ -346,6 +358,15 @@ src_test_network_CFLAGS = \ src_test_network_LDADD = \ src/libloc.la +src_test_network_list_SOURCES = \ + src/test-network-list.c + +src_test_network_list_CFLAGS = \ + $(TESTS_CFLAGS) + +src_test_network_list_LDADD = \ + src/libloc.la + src_test_stringpool_SOURCES = \ src/test-stringpool.c @@ -376,8 +397,7 @@ src_test_signature_LDADD = \ # ------------------------------------------------------------------------------ MANPAGES = \ - man/location-downloader.8 \ - man/location-query.8 + man/location.8 MANPAGES_TXT = $(patsubst %.8,%.txt,$(MANPAGES)) MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT)) @@ -437,9 +457,20 @@ man/%.html: man/%.txt man/asciidoc.conf upload-man: $(MANPAGES_HTML) rsync -avHz --delete --progress $(MANPAGES_HTML) ms@fs01.haj.ipfire.org:/pub/man-pages/$(PACKAGE_NAME)/ -$(DEBIAN_TARBALL_NAME): dist - cp -v $(distdir).tar.xz $@ +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: $(DEBIAN_TARBALL_NAME) - debuild -i -us -uc -b +debian: dist + $(SHELL) debian/build.sh $(PACKAGE_NAME)-$(PACKAGE_VERSION) $(distdir).tar.xz