-Wl,--gc-sections
endif
-LIBLOC_CURRENT=0
+LIBLOC_CURRENT=1
LIBLOC_REVISION=0
LIBLOC_AGE=0
-e 's,@databasedir\@,$(databasedir),g' \
< $< > $@ || rm $@
-databasedir = $(datadir)/location
+databasedir = $(localstatedir)/lib/location
pkgconfigdir = $(libdir)/pkgconfig
+# Overwrite Python path
+pkgpythondir = $(pythondir)/location
+
%: %.in Makefile
$(SED_PROCESS)
# ------------------------------------------------------------------------------
.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 \
examples/python/create-database.py \
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
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
src_libloc_la_LDFLAGS += -export-symbols $(top_srcdir)/src/libloc.sym
endif
+src_libloc_la_LIBADD = \
+ $(OPENSSL_LIBS) \
+ $(RESOLV_LIBS)
+
src_libloc_la_DEPENDENCIES = \
${top_srcdir}/src/libloc.sym
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 \
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)
@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) LD_RUN_PATH=
.PHONY: check-perl
check-perl: testdata.db
- cd $(builddir)/src/perl && $(MAKE) test database="../../$<"
+ cd $(builddir)/src/perl && $(MAKE) LD_LIBRARY_PATH="$(abs_builddir)/src/.libs" test \
+ database="../../$<" keyfile="$(abs_srcdir)/examples/public-key.pem"
.PHONY: install-perl
install-perl:
$(DESTDIR)/$(prefix)/man/man3/Location.3pm
bin_SCRIPTS = \
- src/python/location-downloader \
- src/python/location-query
+ src/python/location \
+ src/python/location-importer
EXTRA_DIST += \
- src/python/location-downloader.in \
- src/python/location-query.in
+ src/python/location.in \
+ src/python/location-importer.in
CLEANFILES += \
- src/python/location-downloader \
- 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)
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
+
+# ------------------------------------------------------------------------------
+
+dist_database_DATA = \
+ src/signing-key.pem
# ------------------------------------------------------------------------------
TESTS_CFLAGS = \
$(AM_CFLAGS) \
- -DLIBLOC_PRIVATE
+ -DLIBLOC_PRIVATE \
+ -DABS_SRCDIR=\"$(abs_srcdir)\"
TESTS = \
src/test-libloc \
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
- PYTHONPATH=$(abs_builddir)/src/python/.libs $(PYTHON) $< $@
+ PYTHONPATH=$(abs_builddir)/src/python/.libs \
+ ABS_SRCDIR="$(abs_srcdir)" \
+ $(PYTHON) $< $@
check_PROGRAMS = \
src/test-libloc \
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
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
src_test_database_LDADD = \
src/libloc.la
+src_test_signature_SOURCES = \
+ src/test-signature.c
+
+src_test_signature_CFLAGS = \
+ $(TESTS_CFLAGS)
+
+src_test_signature_LDADD = \
+ src/libloc.la
+
# ------------------------------------------------------------------------------
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))
.PHONY: man
man: $(MANPAGES) $(MANPAGES_HTML)
-if ENABLE_MANPAGES
+if ENABLE_MAN_PAGES
man_MANS = \
$(MANPAGES)
endif
$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+# Let XSLT find its source on Mac OS X
+ ifeq ($(OS),Darwin)
+export XML_CATALOG_FILES = /usr/local/etc/xml/catalog
+ endif
+
man/%.xml: man/%.txt man/asciidoc.conf
$(AM_V_ASCIIDOC)$(MKDIR_P) $(dir $@) && \
$(ASCIIDOC) \
.PHONY: upload-man
upload-man: $(MANPAGES_HTML)
rsync -avHz --delete --progress $(MANPAGES_HTML) ms@fs01.haj.ipfire.org:/pub/man-pages/$(PACKAGE_NAME)/
+
+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: dist
+ $(SHELL) debian/build.sh $(PACKAGE_NAME)-$(PACKAGE_VERSION) $(distdir).tar.xz
projects / people / ms / libloc.git / blobdiff