]> 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
lua: Create Country objects
[people/ms/libloc.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8de0edf7ce6c0b737530fef1bf7658b213160f4e..f61997edbc3c56d312e0fde438ca0c1c7c2e22b4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ CLEANFILES =
 INSTALL_DIRS =
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
+check_SCRIPTS =
 
 SUBDIRS = . po
 BINDINGS =
@@ -13,6 +14,8 @@ if ENABLE_PERL
 BINDINGS += perl
 endif
 
+bashcompletiondir = @bashcompletiondir@
+
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -34,7 +37,7 @@ AM_LDFLAGS = ${my_LDFLAGS}
  endif
 
 LIBLOC_CURRENT=1
-LIBLOC_REVISION=2
+LIBLOC_REVISION=3
 LIBLOC_AGE=0
 
 DISTCHECK_CONFIGURE_FLAGS = \
@@ -102,6 +105,7 @@ pkginclude_HEADERS = \
        src/libloc/format.h \
        src/libloc/network.h \
        src/libloc/network-list.h \
+       src/libloc/network-tree.h \
        src/libloc/private.h \
        src/libloc/stringpool.h \
        src/libloc/resolv.h \
@@ -120,6 +124,7 @@ src_libloc_la_SOURCES = \
        src/database.c \
        src/network.c \
        src/network-list.c \
+       src/network-tree.c \
        src/resolv.c \
        src/stringpool.c \
        src/writer.c
@@ -175,6 +180,14 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libloc.pc
 
+if BUILD_BASH_COMPLETION
+bashcompletion_DATA = \
+       bash-completion/location
+endif
+
+EXTRA_DIST += \
+       bash-completion/location
+
 dist_pkgpython_PYTHON = \
        src/python/location/__init__.py \
        src/python/location/database.py \
@@ -215,6 +228,58 @@ src_python__location_la_LIBADD = \
        src/libloc.la \
        $(PYTHON_LIBS)
 
+# ------------------------------------------------------------------------------
+
+if ENABLE_LUA
+lua_LTLIBRARIES = \
+       src/lua/location.la
+
+luadir = $(LUA_INSTALL_CMOD)
+
+src_lua_location_la_SOURCES = \
+       src/lua/country.c \
+       src/lua/country.h \
+       src/lua/database.c \
+       src/lua/database.h \
+       src/lua/location.c \
+       src/lua/location.h \
+       src/lua/network.c \
+       src/lua/network.h
+
+src_lua_location_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LUA_CFLAGS)
+
+src_lua_location_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       $(LUA_LDFLAGS) \
+       -shared \
+       -module \
+       -avoid-version
+
+src_lua_location_la_LIBADD = \
+       src/libloc.la \
+       $(LUA_LIBS)
+endif
+
+EXTRA_DIST += \
+       src/lua/country.c \
+       src/lua/country.h \
+       src/lua/database.c \
+       src/lua/database.h \
+       src/lua/location.c \
+       src/lua/location.h \
+       src/lua/network.c \
+       src/lua/network.h
+
+LUA_TESTS = \
+       tests/lua/main.lua
+
+EXTRA_DIST += \
+       $(LUA_TESTS)
+
+# ------------------------------------------------------------------------------
+
 # Compile & install bindings
 all-local: $(foreach binding,$(BINDINGS),build-$(binding))
 check-local: $(foreach binding,$(BINDINGS),check-$(binding))
@@ -241,7 +306,8 @@ build-perl: src/libloc.la
        @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 NO_PACKLIST=1 NO_PERLLOCAL=1 \
+               INSTALLDIRS=vendor \
                INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc"
        cd $(builddir)/src/perl && $(MAKE)
        touch build-perl
@@ -253,20 +319,20 @@ check-perl: testdata.db build-perl
 
 .PHONY: install-perl
 install-perl: build-perl
-       cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR)
+       cd $(builddir)/src/perl && $(MAKE) install DESTDIR=$(DESTDIR)
 
 .PHONY: clean-perl
 clean-perl:
        cd $(builddir)/src/perl && $(MAKE) distclean
-       rm build-perl
+       rm -f build-perl
 
 .PHONY: uninstall-perl
 uninstall-perl:
-       rm -rvf \
-               $(DESTDIR)/$(prefix)/lib/*/perl/*/Location.pm \
-               $(DESTDIR)/$(prefix)/lib/*/perl/*/auto/Location \
-               $(DESTDIR)/$(prefix)/lib/*/perl/*/perllocal.pod \
-               $(DESTDIR)/$(prefix)/man/man3/Location.3pm
+       rm -vf \
+               $(DESTDIR)/@PERL_MODPATH@/Location.pm \
+               $(DESTDIR)/@PERL_MODPATH@/auto/Location/Location.so \
+               $(DESTDIR)/@PERL_MANPATH@/Location.3pm
+       -rmdir $(DESTDIR)/@PERL_MODPATH@/auto/Location
 
 bin_SCRIPTS = \
        src/scripts/location \
@@ -314,6 +380,9 @@ dist_database_DATA = \
        data/database.db \
        data/signing-key.pem
 
+install-data-hook:
+       chmod 444 $(DESTDIR)$(databasedir)/database.db
+
 .PHONY: update-database
 update-database:
        curl https://location.ipfire.org/databases/1/location.db.xz | xz -d > data/database.db
@@ -330,11 +399,14 @@ TESTS_LDADD = \
        src/libloc-internal.la
 
 TESTS_ENVIRONMENT = \
+       LUA_CPATH="$(abs_builddir)/src/lua/.libs/?.so;;" \
        PYTHONPATH=$(abs_srcdir)/src/python:$(abs_builddir)/src/python/.libs \
-       TEST_DATA_DIR="$(abs_top_srcdir)/data"
+       TEST_DATA_DIR="$(abs_top_srcdir)/data" \
+       TEST_DATABASE="$(abs_top_srcdir)/data/database.db"
 
 TESTS = \
        $(check_PROGRAMS) \
+       $(check_SCRIPTS) \
        $(dist_check_SCRIPTS)
 
 CLEANFILES += \
@@ -346,9 +418,16 @@ testdata.db: examples/python/create-database.py
                $(PYTHON) $< $@
 
 dist_check_SCRIPTS = \
+       tests/python/country.py \
+       tests/python/networks-dedup.py \
        tests/python/test-database.py \
        tests/python/test-export.py
 
+if ENABLE_LUA
+check_SCRIPTS += \
+       $(LUA_TESTS)
+endif
+
 check_PROGRAMS = \
        src/test-libloc \
        src/test-stringpool \
@@ -445,7 +524,7 @@ src_test_address_LDADD = \
 
 MANPAGES = \
        $(MANPAGES_3) \
-       $(MANPAGES_8)
+       $(MANPAGES_1)
 
 MANPAGES_3 = \
        man/libloc.3 \
@@ -459,12 +538,12 @@ MANPAGES_3 = \
        man/loc_set_log_fn.3 \
        man/loc_set_log_priority.3
 
-MANPAGES_8 = \
-       man/location.8
+MANPAGES_1 = \
+       man/location.1
 
-MANPAGES_TXT   = $(MANPAGES_TXT_3) $(MANPAGES_TXT_8)
+MANPAGES_TXT   = $(MANPAGES_TXT_3) $(MANPAGES_TXT_1)
 MANPAGES_TXT_3 = $(patsubst %.3,%.txt,$(MANPAGES_3))
-MANPAGES_TXT_8 = $(patsubst %.8,%.txt,$(MANPAGES_8))
+MANPAGES_TXT_1 = $(patsubst %.1,%.txt,$(MANPAGES_1))
 MANPAGES_HTML  = $(patsubst %.txt,%.html,$(MANPAGES_TXT))
 MANPAGES_XML   = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
 
@@ -512,7 +591,7 @@ man/%.xml: man/%.txt man/asciidoc.conf
 man/%.3: man/%.xml
        $(XSLTPROC_COMMAND_MAN)
 
-man/%.8: man/%.xml
+man/%.1: man/%.xml
        $(XSLTPROC_COMMAND_MAN)
 
 man/%.html: man/%.txt man/asciidoc.conf
@@ -525,6 +604,9 @@ 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)/
 
+EXTRA_DIST += \
+       tools/copy.py
+
 EXTRA_DIST += \
        debian/build.sh \
        debian/changelog \
A library to determine the location of someone on the Internet