python: Do not use any GNU-style initialisers for structs

[people/ms/libloc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ea82663e0a03e93c7bea83075013c6c055d1ee91..fc6f3135bb82f56ca69874a76bb123db5c57b94e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@ CLEANFILES =
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 
+SUBDIRS = . po
+
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -27,14 +29,25 @@ SED_PROCESS = \
        -e 's,@exec_prefix\@,$(exec_prefix),g' \
        -e 's,@libdir\@,$(libdir),g' \
        -e 's,@includedir\@,$(includedir),g' \
+       -e 's,@databasedir\@,$(databasedir),g' \
        < $< > $@ || rm $@
 
-pythondir    = $(pyexecdir)
+databasedir = $(datadir)/location
 pkgconfigdir = $(libdir)/pkgconfig
 
-%.pc: %.pc.in Makefile
+%: %.in Makefile
        $(SED_PROCESS)
 
+@INTLTOOL_POLICY_RULE@
+
+.PHONY: update-po
+update-po:
+       $(MAKE) -C po update-po
+
+EXTRA_DIST += \
+       examples/python/create-database.py \
+       examples/python/read-database.py
+
 pkginclude_HEADERS = \
        src/loc/libloc.h \
        src/loc/as.h \
@@ -80,15 +93,20 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libloc.pc
 
-pkgpyexec_LTLIBRARIES = \
+pyexec_LTLIBRARIES = \
        src/python/location.la
 
 src_python_location_la_SOURCES = \
        src/python/locationmodule.c \
+       src/python/locationmodule.h \
        src/python/as.c \
        src/python/as.h \
        src/python/database.c \
-       src/python/database.h
+       src/python/database.h \
+       src/python/network.c \
+       src/python/network.h \
+       src/python/writer.c \
+       src/python/writer.h
 
 src_python_location_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -104,6 +122,19 @@ src_python_location_la_LIBADD = \
        src/libloc.la \
        $(PYTHON_LIBS)
 
+bin_SCRIPTS = \
+       src/python/location-query
+
+EXTRA_DIST += \
+       src/python/location-query.in
+
+CLEANFILES += \
+       src/python/location-query
+
+TESTS_CFLAGS = \
+       $(AM_CFLAGS) \
+       -DLIBLOC_PRIVATE
+
 TESTS = \
        src/test-libloc \
        src/test-stringpool \
@@ -111,6 +142,9 @@ TESTS = \
        src/test-as \
        src/test-network
 
+CLEANFILES += \
+       test.db
+
 check_PROGRAMS = \
        src/test-libloc \
        src/test-stringpool \
@@ -121,29 +155,44 @@ check_PROGRAMS = \
 src_test_libloc_SOURCES = \
        src/test-libloc.c
 
+src_test_libloc_CFLAGS = \
+       $(TESTS_CFLAGS)
+
 src_test_libloc_LDADD = \
        src/libloc.la
 
 src_test_as_SOURCES = \
        src/test-as.c
 
+src_test_as_CFLAGS = \
+       $(TESTS_CFLAGS)
+
 src_test_as_LDADD = \
        src/libloc.la
 
 src_test_network_SOURCES = \
        src/test-network.c
 
+src_test_network_CFLAGS = \
+       $(TESTS_CFLAGS)
+
 src_test_network_LDADD = \
        src/libloc.la
 
 src_test_stringpool_SOURCES = \
        src/test-stringpool.c
 
+src_test_stringpool_CFLAGS = \
+       $(TESTS_CFLAGS)
+
 src_test_stringpool_LDADD = \
        src/libloc.la
 
 src_test_database_SOURCES = \
        src/test-database.c
 
+src_test_database_CFLAGS = \
+       $(TESTS_CFLAGS)
+
 src_test_database_LDADD = \
        src/libloc.la