Revert "Tests: Disable testing for valid signature"

[location/libloc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cf94eab3b0144451ffcb600c69ca6f7b27065918..5a6904fb19bd7f6a2a8a18a1cae85f041dc8abe9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,9 @@ OS = $(shell uname -s)
 
 DEBIAN_TARBALL_NAME = $(PACKAGE_NAME)_$(PACKAGE_VERSION).orig.tar.xz
 
+CLEANFILES += \
+       $(DEBIAN_TARBALL_NAME)
+
 if ENABLE_PERL
 BINDINGS += perl
 endif
@@ -53,9 +56,16 @@ SED_PROCESS = \
        -e 's,@databasedir\@,$(databasedir),g' \
        < $< > $@ || rm $@
 
-databasedir = $(datadir)/location
+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
+
 %: %.in Makefile
        $(SED_PROCESS)
 
@@ -78,6 +88,8 @@ update-po:
        $(MAKE) -C po update-po
 
 EXTRA_DIST += \
+       examples/private-key.pem \
+       examples/public-key.pem \
        examples/python/create-database.py \
        examples/python/read-database.py
 
@@ -125,6 +137,7 @@ src_libloc_la_LDFLAGS += -export-symbols $(top_srcdir)/src/libloc.sym
 endif
 
 src_libloc_la_LIBADD = \
+       $(OPENSSL_LIBS) \
        $(RESOLV_LIBS)
 
 src_libloc_la_DEPENDENCIES = \
@@ -139,10 +152,17 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libloc.pc
 
+dist_pkgpython_PYTHON = \
+       src/python/__init__.py \
+       src/python/database.py \
+       src/python/i18n.py \
+       src/python/importer.py \
+       src/python/logger.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 \
@@ -156,17 +176,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)
 
@@ -199,11 +219,12 @@ 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
-       cd $(builddir)/src/perl && $(MAKE) LD_LIBRARY_PATH="$(abs_builddir)/src/.libs" 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:
@@ -223,15 +244,22 @@ uninstall-perl:
 
 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
+
 # ------------------------------------------------------------------------------
 
 if HAVE_SYSTEMD
@@ -252,9 +280,15 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+dist_database_DATA = \
+       src/signing-key.pem
+
+# ------------------------------------------------------------------------------
+
 TESTS_CFLAGS = \
        $(AM_CFLAGS) \
-       -DLIBLOC_PRIVATE
+       -DLIBLOC_PRIVATE \
+       -DABS_SRCDIR=\"$(abs_srcdir)\"
 
 TESTS = \
        src/test-libloc \
@@ -262,14 +296,17 @@ 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 \
@@ -277,7 +314,8 @@ check_PROGRAMS = \
        src/test-database \
        src/test-as \
        src/test-network \
-       src/test-country
+       src/test-country \
+       src/test-signature
 
 src_test_libloc_SOURCES = \
        src/test-libloc.c
@@ -333,6 +371,15 @@ src_test_database_CFLAGS = \
 src_test_database_LDADD = \
        src/libloc.la
 
+src_test_signature_SOURCES = \
+       src/test-signature.c
+
+src_test_signature_CFLAGS = \
+       $(TESTS_CFLAGS)
+
+src_test_signature_LDADD = \
+       src/libloc.la
+
 # ------------------------------------------------------------------------------
 
 MANPAGES = \