-ffunction-sections \
-fdata-sections
-AM_LDFLAGS =
+AM_LDFLAGS = ${my_LDFLAGS}
# leaving a space here to work around automake's conditionals
ifeq ($(OS),Darwin)
endif
LIBLOC_CURRENT=1
-LIBLOC_REVISION=0
+LIBLOC_REVISION=2
LIBLOC_AGE=0
DISTCHECK_CONFIGURE_FLAGS = \
-e 's,@databasedir\@,$(databasedir),g' \
< $< > $@ || rm $@
+cron_dailydir = $(sysconfdir)/cron.daily
databasedir = $(localstatedir)/lib/location
pkgconfigdir = $(libdir)/pkgconfig
# Overwrite Python path
-pkgpythondir = $(pythondir)/location
+#pkgpythondir = $(pythondir)/location
+pkgpythondir = /usr/lib/python3/dist-packages/location
%: %.in Makefile
$(SED_PROCESS)
$(MAKE) -C po update-po
po/POTFILES.in: Makefile
- find $(abs_srcdir)/src | \
- grep -E "\.(in|py)$$" | sed -e "s@$(abs_srcdir)/@@g" | sort > $@
+ 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/python/read-database.py
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 \
- src/loc/writer.h
+ src/libloc/libloc.h \
+ src/libloc/address.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
src_libloc_la_SOURCES = \
src/libloc.c \
+ src/address.c \
src/as.c \
src/as-list.c \
src/country.c \
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
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
+ src/python/location/__init__.py \
+ src/python/location/database.py \
+ src/python/location/downloader.py \
+ src/python/location/export.py \
+ src/python/location/i18n.py \
+ src/python/location/importer.py \
+ src/python/location/logger.py
pyexec_LTLIBRARIES = \
src/python/_location.la
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) CC="$(CC)" LD="$(LD)" LD_RUN_PATH=
+ cd $(builddir)/src/perl && $(MAKE) LD_RUN_PATH=
.PHONY: check-perl
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:
$(DESTDIR)/$(prefix)/man/man3/Location.3pm
bin_SCRIPTS = \
- src/python/location \
- src/python/location-importer
+ src/scripts/location \
+ src/scripts/location-importer
EXTRA_DIST += \
- src/python/location.in \
- src/python/location-importer.in
+ src/scripts/location.in \
+ src/scripts/location-importer.in
CLEANFILES += \
- src/python/location \
- src/python/location-importer
+ src/scripts/location \
+ src/scripts/location-importer
# ------------------------------------------------------------------------------
+# Use systemd timers if available
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
src/systemd/location-update.service \
INSTALL_DIRS += \
$(systemdsystemunitdir)
+
+# Otherwise fall back to cron
+else
+cron_daily_SCRIPTS = \
+ src/cron/location-update
+
+CLEANFILES += \
+ $(cron_daily_DATA)
endif
EXTRA_DIST += \
+ src/cron/location-update.in \
src/systemd/location-update.service.in \
src/systemd/location-update.timer.in
-DLIBLOC_PRIVATE \
-DABS_SRCDIR=\"$(abs_srcdir)\"
+TESTS_LDADD = \
+ src/libloc.la \
+ src/libloc-internal.la
+
+TESTS_ENVIRONMENT = \
+ PYTHONPATH=$(abs_srcdir)/src/python:$(abs_builddir)/src/python/.libs \
+ TEST_DATA_DIR="$(abs_top_srcdir)/tests/data"
+
TESTS = \
- src/test-libloc \
- src/test-stringpool \
- src/test-database \
- src/test-as \
- src/test-network \
- src/test-country \
- src/test-signature
+ $(check_PROGRAMS) \
+ $(dist_check_SCRIPTS)
+
+EXTRA_DIST += \
+ tests/data/location-2022-03-30.db
CLEANFILES += \
testdata.db
testdata.db: examples/python/create-database.py
- PYTHONPATH=$(abs_builddir)/src/python/.libs \
+ PYTHONPATH=$(abs_srcdir)/src/python:$(abs_builddir)/src/python/.libs \
ABS_SRCDIR="$(abs_srcdir)" \
$(PYTHON) $< $@
+dist_check_SCRIPTS = \
+ tests/python/test-database.py \
+ tests/python/test-export.py
+
check_PROGRAMS = \
src/test-libloc \
src/test-stringpool \
src/test-network \
src/test-network-list \
src/test-country \
- src/test-signature
+ src/test-signature \
+ src/test-address
src_test_libloc_SOURCES = \
src/test-libloc.c
$(TESTS_CFLAGS)
src_test_libloc_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_as_SOURCES = \
src/test-as.c
$(TESTS_CFLAGS)
src_test_as_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_country_SOURCES = \
src/test-country.c
$(TESTS_CFLAGS)
src_test_country_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_network_SOURCES = \
src/test-network.c
$(TESTS_CFLAGS)
src_test_network_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_network_list_SOURCES = \
src/test-network-list.c
$(TESTS_CFLAGS)
src_test_network_list_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_stringpool_SOURCES = \
src/test-stringpool.c
$(TESTS_CFLAGS)
src_test_stringpool_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_database_SOURCES = \
src/test-database.c
$(TESTS_CFLAGS)
src_test_database_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
src_test_signature_SOURCES = \
src/test-signature.c
$(TESTS_CFLAGS)
src_test_signature_LDADD = \
- src/libloc.la
+ $(TESTS_LDADD)
+
+src_test_address_SOURCES = \
+ src/test-address.c
+
+src_test_address_CFLAGS = \
+ $(TESTS_CFLAGS)
+
+src_test_address_LDADD = \
+ $(TESTS_LDADD)
# ------------------------------------------------------------------------------
MANPAGES = \
+ $(MANPAGES_3) \
+ $(MANPAGES_8)
+
+MANPAGES_3 = \
+ man/libloc.3 \
+ man/loc_database_count_as.3 \
+ man/loc_database_get_as.3 \
+ man/loc_database_get_country.3 \
+ man/loc_database_lookup.3 \
+ man/loc_database_new.3 \
+ man/loc_get_log_priority.3 \
+ man/loc_new.3 \
+ man/loc_set_log_fn.3 \
+ man/loc_set_log_priority.3
+
+MANPAGES_8 = \
man/location.8
-MANPAGES_TXT = $(patsubst %.8,%.txt,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT))
-MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
+MANPAGES_TXT = $(MANPAGES_TXT_3) $(MANPAGES_TXT_8)
+MANPAGES_TXT_3 = $(patsubst %.3,%.txt,$(MANPAGES_3))
+MANPAGES_TXT_8 = $(patsubst %.8,%.txt,$(MANPAGES_8))
+MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT))
+MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
.PHONY: man
man: $(MANPAGES) $(MANPAGES_HTML)
-f $(abs_srcdir)/man/asciidoc.conf \
-d manpage -b docbook -o $@ $<
+man/%.3: man/%.xml
+ $(XSLTPROC_COMMAND_MAN)
+
man/%.8: man/%.xml
$(XSLTPROC_COMMAND_MAN)
EXTRA_DIST += \
debian/build.sh \
debian/changelog \
- debian/compat \
debian/control \
debian/copyright \
- debian/location.install \
- debian/location.manpages \
- debian/location-python.install \
+ debian/genchangelog.sh \
+ debian/gensymbols.sh \
debian/libloc1.install \
+ debian/libloc1.symbols \
debian/libloc-dev.install \
+ debian/location.install \
+ debian/location.postinst \
+ debian/location.postrm \
+ debian/python3-location.examples \
+ debian/python3-location.install \
debian/rules \
- debian/source/format
+ debian/source/format \
+ debian/watch
.PHONY: debian
debian: dist
projects / location / libloc.git / blobdiff