network-list: Set elements pointer to NULL so that we know it is empty

[location/libloc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9f520cc6079bd4b91d7414257673fc7c2d024931..ebd7e1771c896d479c9a1be0439e94803d86190c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,13 +33,10 @@ AM_LDFLAGS =
                -Wl,--gc-sections
  endif
 
-LIBLOC_CURRENT=0
+LIBLOC_CURRENT=1
 LIBLOC_REVISION=0
 LIBLOC_AGE=0
 
-pythondir = $(prefix)/lib/python3/dist-packages
-pyexecdir = $(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload
-
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
@@ -78,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 \
@@ -90,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 \
@@ -106,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
@@ -147,7 +154,6 @@ CLEANFILES += \
        src/libloc.pc
 
 dist_pkgpython_PYTHON = \
-       src/python/__init__.py \
        src/python/database.py \
        src/python/downloader.py \
        src/python/export.py \
@@ -155,6 +161,15 @@ dist_pkgpython_PYTHON = \
        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
 
@@ -303,6 +318,7 @@ check_PROGRAMS = \
        src/test-database \
        src/test-as \
        src/test-network \
+       src/test-network-list \
        src/test-country \
        src/test-signature
 
@@ -342,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
 
@@ -438,11 +463,11 @@ EXTRA_DIST += \
        debian/compat \
        debian/control \
        debian/copyright \
+       debian/location.install \
+       debian/location.manpages \
+       debian/location-python.install \
+       debian/libloc1.install \
        debian/libloc-dev.install \
-       debian/libloc.install \
-       debian/libloc.lintian-overrides \
-       debian/libloc.manpages \
-       debian/libloc-perl.install \
        debian/rules \
        debian/source/format