Move location-downloader functionality into location-query

[location/libloc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e3a55d4f53e922196e3d85fc6a81f508766990c1..c0b1300eb27ecd52c0ab1c541de17e9a18feae05 100644 (file)
--- 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
@@ -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
 
@@ -154,7 +145,10 @@ CLEANFILES += \
 
 dist_pkgpython_PYTHON = \
        src/python/__init__.py \
+       src/python/database.py \
+       src/python/downloader.py \
        src/python/i18n.py \
+       src/python/importer.py \
        src/python/logger.py
 
 pyexec_LTLIBRARIES = \
@@ -217,7 +211,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
@@ -241,19 +235,16 @@ uninstall-perl:
                $(DESTDIR)/$(prefix)/man/man3/Location.3pm
 
 bin_SCRIPTS = \
-       src/python/location-downloader \
        src/python/location-exporter \
        src/python/location-importer \
        src/python/location-query
 
 EXTRA_DIST += \
-       src/python/location-downloader.in \
        src/python/location-exporter.in \
        src/python/location-importer.in \
        src/python/location-query.in
 
 CLEANFILES += \
-       src/python/location-downloader \
        src/python/location-exporter \
        src/python/location-importer \
        src/python/location-query
@@ -294,10 +285,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
@@ -441,9 +432,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/libloc-dev.install \
+       debian/libloc.install \
+       debian/libloc.lintian-overrides \
+       debian/libloc.manpages \
+       debian/libloc-perl.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