]> git.ipfire.org Git - people/ms/libloc.git/blobdiff - Makefile.am
projects / people / ms / libloc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move all address convenience functions into their own header
[people/ms/libloc.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index ef57551fa7a7e77d9256c5d89e7e85617b5232b0..e5197a56cacbe8d37ded38cb597795fdf51198fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,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)
@@ -33,13 +33,10 @@ AM_LDFLAGS =
                -Wl,--gc-sections
  endif
 
-LIBLOC_CURRENT=0
-LIBLOC_REVISION=0
+LIBLOC_CURRENT=1
+LIBLOC_REVISION=1
 LIBLOC_AGE=0
 
-pythondir = $(prefix)/lib/python3/dist-packages
-pyexecdir = $(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload
-
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
@@ -82,8 +79,9 @@ 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 > $@
+       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 \
@@ -92,17 +90,21 @@ 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/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
@@ -110,9 +112,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
@@ -141,6 +146,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
 
@@ -151,7 +174,6 @@ CLEANFILES += \
        src/libloc.pc
 
 dist_pkgpython_PYTHON = \
-       src/python/__init__.py \
        src/python/database.py \
        src/python/downloader.py \
        src/python/export.py \
@@ -159,6 +181,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
 
@@ -219,7 +250,7 @@ build-perl:
 
        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
@@ -228,7 +259,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:
@@ -284,6 +315,10 @@ TESTS_CFLAGS = \
        -DLIBLOC_PRIVATE \
        -DABS_SRCDIR=\"$(abs_srcdir)\"
 
+TESTS_LDADD = \
+       src/libloc.la \
+       src/libloc-internal.la
+
 TESTS = \
        src/test-libloc \
        src/test-stringpool \
@@ -307,6 +342,7 @@ check_PROGRAMS = \
        src/test-database \
        src/test-as \
        src/test-network \
+       src/test-network-list \
        src/test-country \
        src/test-signature
 
@@ -317,7 +353,7 @@ src_test_libloc_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_libloc_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_as_SOURCES = \
        src/test-as.c
@@ -326,7 +362,7 @@ src_test_as_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_as_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_country_SOURCES = \
        src/test-country.c
@@ -335,7 +371,7 @@ src_test_country_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_country_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_network_SOURCES = \
        src/test-network.c
@@ -344,7 +380,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
@@ -353,7 +398,7 @@ src_test_stringpool_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_stringpool_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_database_SOURCES = \
        src/test-database.c
@@ -362,7 +407,7 @@ src_test_database_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_database_LDADD = \
-       src/libloc.la
+       $(TESTS_LDADD)
 
 src_test_signature_SOURCES = \
        src/test-signature.c
@@ -371,21 +416,39 @@ src_test_signature_CFLAGS = \
        $(TESTS_CFLAGS)
 
 src_test_signature_LDADD = \
-       src/libloc.la
+       $(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)
 
-if ENABLE_MANPAGES
+if ENABLE_MAN_PAGES
 man_MANS = \
        $(MANPAGES)
 endif
@@ -423,6 +486,9 @@ man/%.xml: man/%.txt man/asciidoc.conf
                -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)
 
@@ -444,9 +510,8 @@ EXTRA_DIST += \
        debian/copyright \
        debian/location.install \
        debian/location.manpages \
-       debian/location-perl.install \
        debian/location-python.install \
-       debian/libloc0.install \
+       debian/libloc1.install \
        debian/libloc-dev.install \
        debian/rules \
        debian/source/format
A library to determine the location of someone on the Internet