python: Remove local stringpool and ctx from AS class

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

diff --git a/Makefile.am b/Makefile.am
index a47cdaeee557430d1095d2273cc096d54808438c..7061b055eeeb738a89fdb42970b0cd0a8afb5470 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src
 
 AM_CFLAGS = ${my_CFLAGS} \
-       -fvisibility=hidden \
        -ffunction-sections \
        -fdata-sections
 
@@ -30,27 +29,40 @@ SED_PROCESS = \
        -e 's,@includedir\@,$(includedir),g' \
        < $< > $@ || rm $@
 
+pythondir    = $(pyexecdir)
 pkgconfigdir = $(libdir)/pkgconfig
 
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
 pkginclude_HEADERS = \
-       src/loc/libloc.h
+       src/loc/libloc.h \
+       src/loc/as.h \
+       src/loc/database.h \
+       src/loc/format.h \
+       src/loc/network.h \
+       src/loc/private.h \
+       src/loc/stringpool.h \
+       src/loc/writer.h
 
 lib_LTLIBRARIES = \
        src/libloc.la
 
-src_libloc_la_SOURCES =\
-       src/libloc-private.h \
+src_libloc_la_SOURCES = \
        src/libloc.c \
+       src/as.c \
        src/database.c \
-       src/database.h \
+       src/network.c \
        src/stringpool.c \
-       src/stringpool.h
+       src/writer.c
 
 EXTRA_DIST += src/libloc.sym
 
+src_libloc_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -DLIBLOC_PRIVATE \
+       -fvisibility=hidden
+
 src_libloc_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBLOC_CURRENT):$(LIBLOC_REVISION):$(LIBLOC_AGE) \
@@ -68,15 +80,44 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libloc.pc
 
+pkgpyexec_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_location_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(PYTHON_CFLAGS)
+
+src_python_location_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -shared \
+       -module \
+       -avoid-version
+
+src_python_location_la_LIBADD = \
+       src/libloc.la \
+       $(PYTHON_LIBS)
+
 TESTS = \
        src/test-libloc \
        src/test-stringpool \
-       src/test-database
+       src/test-database \
+       src/test-as \
+       src/test-network
 
 check_PROGRAMS = \
        src/test-libloc \
        src/test-stringpool \
-       src/test-database
+       src/test-database \
+       src/test-as \
+       src/test-network
 
 src_test_libloc_SOURCES = \
        src/test-libloc.c
@@ -84,6 +125,18 @@ src_test_libloc_SOURCES = \
 src_test_libloc_LDADD = \
        src/libloc.la
 
+src_test_as_SOURCES = \
+       src/test-as.c
+
+src_test_as_LDADD = \
+       src/libloc.la
+
+src_test_network_SOURCES = \
+       src/test-network.c
+
+src_test_network_LDADD = \
+       src/libloc.la
+
 src_test_stringpool_SOURCES = \
        src/test-stringpool.c