]> git.ipfire.org Git - location/libloc.git/blobdiff - Makefile.am
projects / location / libloc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove overwriting default CPPFLAGS for libloc-internal
[location/libloc.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 1b9d90ea737847a51bb3ca51ae57047773fc1294..08a116f8059c2835c0a9cb2a9d2bb84de6b3049c 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
@@ -27,7 +22,7 @@ AM_CFLAGS = ${my_CFLAGS} \
        -ffunction-sections \
        -fdata-sections
 
-AM_LDFLAGS =
+AM_LDFLAGS = ${my_LDFLAGS}
 
 # leaving a space here to work around automake's conditionals
  ifeq ($(OS),Darwin)
@@ -38,7 +33,7 @@ AM_LDFLAGS =
                -Wl,--gc-sections
  endif
 
-LIBLOC_CURRENT=0
+LIBLOC_CURRENT=1
 LIBLOC_REVISION=0
 LIBLOC_AGE=0
 
@@ -59,6 +54,9 @@ SED_PROCESS = \
 databasedir = $(localstatedir)/lib/location
 pkgconfigdir = $(libdir)/pkgconfig
 
+# Overwrite Python path
+pkgpythondir = $(pythondir)/location
+
 %: %.in Makefile
        $(SED_PROCESS)
 
@@ -77,9 +75,14 @@ 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 -type f \( -name '*.in' -o -name '*.py' \) \
+               \! -exec git check-ignore -q {} \; -print | \
+               sed -e "s@$(abs_srcdir)/@@g" | LC_ALL=C sort > $@
+
 EXTRA_DIST += \
        examples/private-key.pem \
        examples/public-key.pem \
@@ -87,17 +90,20 @@ EXTRA_DIST += \
        examples/python/read-database.py
 
 pkginclude_HEADERS = \
-       src/loc/libloc.h \
-       src/loc/as.h \
-       src/loc/compat.h \
-       src/loc/country.h \
-       src/loc/database.h \
-       src/loc/format.h \
-       src/loc/network.h \
-       src/loc/private.h \
-       src/loc/stringpool.h \
-       src/loc/resolv.h \
-       src/loc/writer.h
+       src/libloc/libloc.h \
+       src/libloc/as.h \
+       src/libloc/as-list.h \
+       src/libloc/compat.h \
+       src/libloc/country.h \
+       src/libloc/country-list.h \
+       src/libloc/database.h \
+       src/libloc/format.h \
+       src/libloc/network.h \
+       src/libloc/network-list.h \
+       src/libloc/private.h \
+       src/libloc/stringpool.h \
+       src/libloc/resolv.h \
+       src/libloc/writer.h
 
 lib_LTLIBRARIES = \
        src/libloc.la
@@ -105,9 +111,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
@@ -136,6 +145,24 @@ src_libloc_la_LIBADD = \
 src_libloc_la_DEPENDENCIES = \
        ${top_srcdir}/src/libloc.sym
 
+noinst_LTLIBRARIES = \
+       src/libloc-internal.la
+
+src_libloc_internal_la_SOURCES = \
+       $(src_libloc_la_SOURCES)
+
+src_libloc_internal_la_CFLAGS = \
+       $(src_libloc_la_CFLAGS)
+
+src_libloc_internal_la_LDFLAGS = \
+       $(filter-out -version-info %,$(src_libloc_la_LDFLAGS))
+
+src_libloc_internal_la_LIBADD = \
+       $(src_libloc_la_LIBADD)
+
+src_libloc_internal_la_DEPENDENCIES = \
+       $(src_libloc_la_DEPENDENCIES)
+
 pkgconfig_DATA = \
        src/libloc.pc
 
@@ -145,10 +172,27 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libloc.pc
 
+dist_pkgpython_PYTHON = \
+       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
+       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 \
@@ -162,17 +206,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)
 
@@ -214,7 +258,7 @@ check-perl: testdata.db
 
 .PHONY: install-perl
 install-perl:
-       cd $(builddir)/src/perl && $(MAKE) install
+       cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR)
 
 .PHONY: clean-perl
 clean-perl:
@@ -229,26 +273,23 @@ uninstall-perl:
                $(DESTDIR)/$(prefix)/man/man3/Location.3pm
 
 bin_SCRIPTS = \
-       src/python/location-downloader \
-       src/python/location-exporter \
-       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-query.in
+       src/python/location.in \
+       src/python/location-importer.in
 
 CLEANFILES += \
-       src/python/location-downloader \
-       src/python/location-exporter \
-       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)
@@ -258,8 +299,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
 
 # ------------------------------------------------------------------------------
 
@@ -273,16 +314,20 @@ TESTS_CFLAGS = \
        -DLIBLOC_PRIVATE \
        -DABS_SRCDIR=\"$(abs_srcdir)\"
 
+TESTS_LDADD = \
+       src/libloc.la \
+       src/libloc-internal.la
+
 TESTS = \
        src/test-libloc \
        src/test-stringpool \
        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
@@ -296,7 +341,9 @@ check_PROGRAMS = \
        src/test-database \
        src/test-as \
        src/test-network \
-       src/test-country
+       src/test-network-list \
+       src/test-country \
+       src/test-signature
 
 src_test_libloc_SOURCES = \
        src/test-libloc.c
@@ -305,7 +352,7 @@ src_test_libloc_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_libloc_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_as_SOURCES = \
        src/test-as.c
@@ -314,7 +361,7 @@ src_test_as_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_as_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_country_SOURCES = \
        src/test-country.c
@@ -323,7 +370,7 @@ src_test_country_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_country_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_network_SOURCES = \
        src/test-network.c
@@ -332,7 +379,16 @@ src_test_network_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_network_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
+
+src_test_network_list_SOURCES = \
+       src/test-network-list.c
+
+src_test_network_list_CFLAGS = \
+       $(TESTS_CFLAGS)
+
+src_test_network_list_LDADD = \
+       $(TESTS_LDADD)
 
 src_test_stringpool_SOURCES = \
        src/test-stringpool.c
@@ -341,7 +397,7 @@ src_test_stringpool_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_stringpool_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_database_SOURCES = \
        src/test-database.c
@@ -350,13 +406,21 @@ src_test_database_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_database_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
+
+src_test_signature_SOURCES = \
+       src/test-signature.c
+
+src_test_signature_CFLAGS = \
+       $(TESTS_CFLAGS)
+
+src_test_signature_LDADD = \
+       $(TESTS_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))
@@ -365,7 +429,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
@@ -416,9 +480,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/location.install \
+       debian/location.manpages \
+       debian/location-python.install \
+       debian/libloc1.install \
+       debian/libloc-dev.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
A library to determine the location of someone on the Internet