X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Flibloc.git;a=blobdiff_plain;f=Makefile.am;h=7061b055eeeb738a89fdb42970b0cd0a8afb5470;hp=6f4875ddfc35d35175f5b786b22261621ac30d01;hb=1da9cd3923d01e4b865f7c5605b16b63fcf32f2a;hpb=a5db3e497572e59767a44a254b75c2a99aebb438

diff --git a/Makefile.am b/Makefile.am
index 6f4875d..7061b05 100644
--- 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,30 +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/as.h \
+	src/loc/database.h \
 	src/loc/format.h \
-	src/loc/libloc.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/as.h \
 	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) \
@@ -71,17 +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-as
+	src/test-as \
+	src/test-network
 
 check_PROGRAMS = \
 	src/test-libloc \
 	src/test-stringpool \
 	src/test-database \
-	src/test-as
+	src/test-as \
+	src/test-network
 
 src_test_libloc_SOURCES = \
 	src/test-libloc.c
@@ -95,6 +131,12 @@ src_test_as_SOURCES = \
 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