X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=d0cc793948d78b93cbbe6eb9f19420866cc2eab0;hb=6661692f3bc8f788af8b75ae25561f4cc4a2acb5;hp=31869e0ca61448e7f7777a93e005399103be45af;hpb=9df8db2ae6268b0901961625fd27b4dde1ed451f;p=people%2Fms%2Flibloc.git

diff --git a/Makefile.am b/Makefile.am
index 31869e0..d0cc793 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ AM_LDFLAGS =
 		-Wl,--gc-sections
  endif
 
-LIBLOC_CURRENT=0
+LIBLOC_CURRENT=1
 LIBLOC_REVISION=0
 LIBLOC_AGE=0
 
@@ -75,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 \
@@ -87,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 \
@@ -103,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
@@ -144,12 +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
 
@@ -234,29 +254,23 @@ 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
+	src/python/location \
+	src/python/location-importer
 
 EXTRA_DIST += \
-	src/python/location-downloader.in \
-	src/python/location-exporter.in \
-	src/python/location-importer.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-importer \
-	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)
@@ -266,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
 
 # ------------------------------------------------------------------------------
 
@@ -373,8 +387,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))
@@ -440,11 +453,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