X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Flibloc.git;a=blobdiff_plain;f=Makefile.am;h=4b865f1635c432ea3538365a35550b6c57f3aa7b;hp=8cec76d538b7ae448564450cbfa3e13af57f971e;hb=37a20a793f1d415ff8384a904efed03c7285c0ef;hpb=f9b76c9de5431422f5efb2816528680d080761c2

diff --git a/Makefile.am b/Makefile.am
index 8cec76d..4b865f1 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
 
@@ -91,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 \
@@ -107,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
@@ -148,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 \
@@ -156,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
 
@@ -214,9 +228,9 @@ build-perl:
 	@test -e $(builddir)/src/perl/t/Location.t || ln -s --relative $(srcdir)/src/perl/t/Location.t $(builddir)/src/perl/t/
 	@test -e $(builddir)/src/perl/typemap || ln -s --relative $(srcdir)/src/perl/typemap $(builddir)/src/perl/
 
-	cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \
+	cd $(builddir)/src/perl && $(PERL) Makefile.PL INSTALLDIRS=vendor \
 		INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc"
-	cd $(builddir)/src/perl && $(MAKE) CC="$(CC)" LD="$(LD)" LD_RUN_PATH=
+	cd $(builddir)/src/perl && $(MAKE) LD_RUN_PATH=
 
 .PHONY: check-perl
 check-perl: testdata.db
@@ -304,6 +318,7 @@ check_PROGRAMS = \
 	src/test-database \
 	src/test-as \
 	src/test-network \
+	src/test-network-list \
 	src/test-country \
 	src/test-signature
 
@@ -343,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
 
@@ -382,7 +406,7 @@ MANPAGES_XML  = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
 .PHONY: man
 man: $(MANPAGES) $(MANPAGES_HTML)
 
-if ENABLE_MANPAGES
+if ENABLE_MAN_PAGES
 man_MANS = \
 	$(MANPAGES)
 endif
@@ -442,7 +466,7 @@ EXTRA_DIST += \
 	debian/location.install \
 	debian/location.manpages \
 	debian/location-python.install \
-	debian/libloc0.install \
+	debian/libloc1.install \
 	debian/libloc-dev.install \
 	debian/rules \
 	debian/source/format