Remove test.db when running "make clean"

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

diff --git a/Makefile.am b/Makefile.am
index 7061b055eeeb738a89fdb42970b0cd0a8afb5470..2372937f0a32673ac3f9b9daa145bd94077adcfa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,12 +29,15 @@ SED_PROCESS = \
        -e 's,@includedir\@,$(includedir),g' \
        < $< > $@ || rm $@
 
-pythondir    = $(pyexecdir)
 pkgconfigdir = $(libdir)/pkgconfig
 
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+EXTRA_DIST += \
+       examples/python/create-database.py \
+       examples/python/read-database.py
+
 pkginclude_HEADERS = \
        src/loc/libloc.h \
        src/loc/as.h \
@@ -80,7 +83,7 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libloc.pc
 
-pkgpyexec_LTLIBRARIES = \
+pyexec_LTLIBRARIES = \
        src/python/location.la
 
 src_python_location_la_SOURCES = \
@@ -89,7 +92,11 @@ src_python_location_la_SOURCES = \
        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) \
@@ -105,6 +112,10 @@ src_python_location_la_LIBADD = \
        src/libloc.la \
        $(PYTHON_LIBS)
 
+TESTS_CFLAGS = \
+       $(AM_CFLAGS) \
+       -DLIBLOC_PRIVATE
+
 TESTS = \
        src/test-libloc \
        src/test-stringpool \
@@ -112,6 +123,9 @@ TESTS = \
        src/test-as \
        src/test-network
 
+CLEANFILES += \
+       test.db
+
 check_PROGRAMS = \
        src/test-libloc \
        src/test-stringpool \
@@ -122,29 +136,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