36 files changed, 25 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index a47ea70..be88fa8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = src data docs
+SUBDIRS = libplanfahr data docs
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index 1c0f8f3..38d9f9e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ REQUIRED_INTLTOOL_VERSION=0.35.0
 PKG_NAME=planfahr
 
 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/libplanfahr.h) || {
+  && test -f $srcdir/libplanfahr/libplanfahr.h) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/configure.ac b/configure.ac
index ee6e38f..d556c9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(libplanfahr, 0.0.0)
-AC_CONFIG_SRCDIR(src/libplanfahr.h)
+AC_CONFIG_SRCDIR(libplanfahr/libplanfahr.h)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
@@ -67,9 +67,9 @@ AC_SUBST(LPF_PROVIDERS_DIR)
 AC_CONFIG_FILES([run],
                 [chmod +x,-w run])
 AC_CONFIG_FILES(Makefile
-                src/Makefile
-                src/providers/Makefile
-                src/providers/tests/Makefile
+                libplanfahr/Makefile
+                libplanfahr/providers/Makefile
+                libplanfahr/providers/tests/Makefile
                 data/Makefile
                 data/libplanfahr-0.0.pc
                 docs/Makefile
diff --git a/data/libplanfahr-0.0.pc.in b/data/libplanfahr-0.0.pc.in
index 25020a9..8e7c220 100644
--- a/data/libplanfahr-0.0.pc.in
+++ b/data/libplanfahr-0.0.pc.in
@@ -8,4 +8,4 @@ Version: @VERSION@
 Description: libplanfahr GObject library
 Requires: gobject-2.0 libxml-2.0
 Libs: -L${libdir} -lplanfahr-0.0
-Cflags: -I${includedir}/liblibplanfahr-0.0
+Cflags: -I${includedir}/libplanfahr-0.0
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 9ed93a8..2148b5b 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -10,7 +10,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting functions and macros.
-DOC_SOURCE_DIR=../../src
+DOC_SOURCE_DIR=../../libplanfahr
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS='--rebuild-types'
@@ -47,7 +47,6 @@ content_files =				\
 # Other files to distribute.
 extra_files =
 
-
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =				\
@@ -58,7 +57,7 @@ GTKDOC_CFLAGS =				\
 	$(NULL)
 
 GTKDOC_LIBS =					\
-	$(top_builddir)/src/libplanfahr-0.0.la	\
+	$(top_builddir)/libplanfahr/libplanfahr-0.0.la	\
 	$(GLIB_LIBS)
 
 # include common portion ...
diff --git a/src/Makefile.am b/libplanfahr/Makefile.am
index 41b86a4..893a43f 100644
--- a/src/Makefile.am
+++ b/libplanfahr/Makefile.am
@@ -26,7 +26,7 @@ PLANFAHR_SOURCE_FILES = \
 	lpf-trip-part.c \
 	$(NULL)
 
-libplanfahr_0_0_ladir = $(includedir)/libplanfahr/
+libplanfahr_0_0_ladir = $(includedir)/libplanfahr-0.0/libplanfahr
 libplanfahr_0_0_la_HEADERS = \
 	$(PLANFAHR_HEADER_FILES) \
 	$(NULL)
@@ -72,7 +72,6 @@ Lpf_0_0_gir_CFLAGS = $(libplanfahr_0_0_la_CFLAGS)
 Lpf_0_0_gir_LIBS = $(builddir)/libplanfahr-0.0.la
 Lpf_0_0_gir_EXPORT_PACKAGES = libplanfahr-0.0
 Lpf_0_0_gir_SCANNERFLAGS = \
-	--c-include="libplanfahr/libplanfahr.h" \
 	--namespace=Lpf \
 	--symbol-prefix=lpf \
 	--pkg=gthread-2.0 \
@@ -80,7 +79,6 @@ Lpf_0_0_gir_SCANNERFLAGS = \
 	-I$(top_srcdir) \
 	$(NULL)
 Lpf_0_0_gir_FILES = \
-	$(srcdir)/libplanfahr.h \
 	$(PLANFAHR_SOURCE_FILES:%=$(srcdir)/%) \
 	$(PLANFAHR_HEADER_FILES:%=$(srcdir)/%) \
 	$(NULL)
diff --git a/src/libplanfahr.h b/libplanfahr/libplanfahr.h
index 37a6c42..d54f370 100644
--- a/src/libplanfahr.h
+++ b/libplanfahr/libplanfahr.h
@@ -25,12 +25,12 @@
 
 #define __LIBPLANFAHR_H_INSIDE__
 
-#include "lpf-loc.h"
-#include "lpf-manager.h"
-#include "lpf-provider.h"
-#include "lpf-stop.h"
-#include "lpf-trip.h"
-#include "lpf-trip-part.h"
+#include <libplanfahr/lpf-loc.h>
+#include <libplanfahr/lpf-manager.h>
+#include <libplanfahr/lpf-provider.h>
+#include <libplanfahr/lpf-stop.h>
+#include <libplanfahr/lpf-trip.h>
+#include <libplanfahr/lpf-trip-part.h>
 
 #undef __LIBPLANFAHR_H_INSIDE__
 
diff --git a/src/libplanfahr.sym b/libplanfahr/libplanfahr.sym
index 1fc8515..1fc8515 100644
--- a/src/libplanfahr.sym
+++ b/libplanfahr/libplanfahr.sym
diff --git a/src/lpf-loc.c b/libplanfahr/lpf-loc.c
index e51e70b..e51e70b 100644
--- a/src/lpf-loc.c
+++ b/libplanfahr/lpf-loc.c
diff --git a/src/lpf-loc.h b/libplanfahr/lpf-loc.h
index 7dc8209..7dc8209 100644
--- a/src/lpf-loc.h
+++ b/libplanfahr/lpf-loc.h
diff --git a/src/lpf-manager.c b/libplanfahr/lpf-manager.c
index e67ddf5..e67ddf5 100644
--- a/src/lpf-manager.c
+++ b/libplanfahr/lpf-manager.c
diff --git a/src/lpf-manager.h b/libplanfahr/lpf-manager.h
index e1bef71..e1bef71 100644
--- a/src/lpf-manager.h
+++ b/libplanfahr/lpf-manager.h
diff --git a/src/lpf-priv.h b/libplanfahr/lpf-priv.h
index 7b1008d..7b1008d 100644
--- a/src/lpf-priv.h
+++ b/libplanfahr/lpf-priv.h
diff --git a/src/lpf-provider.c b/libplanfahr/lpf-provider.c
index 6f7802b..6f7802b 100644
--- a/src/lpf-provider.c
+++ b/libplanfahr/lpf-provider.c
diff --git a/src/lpf-provider.h b/libplanfahr/lpf-provider.h
index e54f612..81d18c0 100644
--- a/src/lpf-provider.h
+++ b/libplanfahr/lpf-provider.h
@@ -24,7 +24,7 @@
 #endif
 
 #include <glib-object.h>
-#include <lpf-loc.h>
+#include <libplanfahr/lpf-loc.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/lpf-stop.c b/libplanfahr/lpf-stop.c
index 3bb4e58..3bb4e58 100644
--- a/src/lpf-stop.c
+++ b/libplanfahr/lpf-stop.c
diff --git a/src/lpf-stop.h b/libplanfahr/lpf-stop.h
index aaebb38..aaebb38 100644
--- a/src/lpf-stop.h
+++ b/libplanfahr/lpf-stop.h
diff --git a/src/lpf-trip-part.c b/libplanfahr/lpf-trip-part.c
index 15ef7f5..15ef7f5 100644
--- a/src/lpf-trip-part.c
+++ b/libplanfahr/lpf-trip-part.c
diff --git a/src/lpf-trip-part.h b/libplanfahr/lpf-trip-part.h
index 57be140..57be140 100644
--- a/src/lpf-trip-part.h
+++ b/libplanfahr/lpf-trip-part.h
diff --git a/src/lpf-trip.c b/libplanfahr/lpf-trip.c
index aa874db..aa874db 100644
--- a/src/lpf-trip.c
+++ b/libplanfahr/lpf-trip.c
diff --git a/src/lpf-trip.h b/libplanfahr/lpf-trip.h
index 3f2af42..3f2af42 100644
--- a/src/lpf-trip.h
+++ b/libplanfahr/lpf-trip.h
diff --git a/src/providers/Makefile.am b/libplanfahr/providers/Makefile.am
index e4f8757..3516708 100644
--- a/src/providers/Makefile.am
+++ b/libplanfahr/providers/Makefile.am
@@ -31,7 +31,7 @@ libplanfahr_provider_ch_sbb_la_CFLAGS = \
 	$(LIBXML2_CFLAGS) \
         $(LIBSOUP_CFLAGS) \
 	$(WARN_CFLAGS) \
-	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/libplanfahr \
 	$(NULL)
 
 libplanfahr_provider_ch_sbb_la_LDFLAGS = \
@@ -55,7 +55,7 @@ libplanfahr_provider_de_db_la_CFLAGS = \
 	$(LIBXML2_CFLAGS) \
         $(LIBSOUP_CFLAGS) \
 	$(WARN_CFLAGS) \
-	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/libplanfahr \
 	$(NULL)
 
 libplanfahr_provider_de_db_la_LDFLAGS = \
@@ -79,7 +79,7 @@ libplanfahr_provider_de_bvg_la_CFLAGS = \
 	$(LIBXML2_CFLAGS) \
         $(LIBSOUP_CFLAGS) \
 	$(WARN_CFLAGS) \
-	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/libplanfahr \
 	$(NULL)
 
 libplanfahr_provider_de_bvg_la_LDFLAGS = \
diff --git a/src/providers/ch-sbb.c b/libplanfahr/providers/ch-sbb.c
index e29405d..e29405d 100644
--- a/src/providers/ch-sbb.c
+++ b/libplanfahr/providers/ch-sbb.c
diff --git a/src/providers/ch-sbb.h b/libplanfahr/providers/ch-sbb.h
index 482d1e7..482d1e7 100644
--- a/src/providers/ch-sbb.h
+++ b/libplanfahr/providers/ch-sbb.h
diff --git a/src/providers/de-bvg.c b/libplanfahr/providers/de-bvg.c
index 0b33834..0b33834 100644
--- a/src/providers/de-bvg.c
+++ b/libplanfahr/providers/de-bvg.c
diff --git a/src/providers/de-bvg.h b/libplanfahr/providers/de-bvg.h
index 9ef055c..9ef055c 100644
--- a/src/providers/de-bvg.h
+++ b/libplanfahr/providers/de-bvg.h
diff --git a/src/providers/de-db.c b/libplanfahr/providers/de-db.c
index f9051fd..f9051fd 100644
--- a/src/providers/de-db.c
+++ b/libplanfahr/providers/de-db.c
diff --git a/src/providers/de-db.h b/libplanfahr/providers/de-db.h
index a011d7f..a011d7f 100644
--- a/src/providers/de-db.h
+++ b/libplanfahr/providers/de-db.h
diff --git a/src/providers/hafas-bin6-format.h b/libplanfahr/providers/hafas-bin6-format.h
index e2878b0..e2878b0 100644
--- a/src/providers/hafas-bin6-format.h
+++ b/libplanfahr/providers/hafas-bin6-format.h
diff --git a/src/providers/hafas-bin6.c b/libplanfahr/providers/hafas-bin6.c
index 33edc4e..33edc4e 100644
--- a/src/providers/hafas-bin6.c
+++ b/libplanfahr/providers/hafas-bin6.c
diff --git a/src/providers/hafas-bin6.h b/libplanfahr/providers/hafas-bin6.h
index 1177c45..1177c45 100644
--- a/src/providers/hafas-bin6.h
+++ b/libplanfahr/providers/hafas-bin6.h
diff --git a/src/providers/tests/Makefile.am b/libplanfahr/providers/tests/Makefile.am
index 2b4ce47..d3ba939 100644
--- a/src/providers/tests/Makefile.am
+++ b/libplanfahr/providers/tests/Makefile.am
@@ -11,11 +11,11 @@ AM_CPPFLAGS = \
 	$(GTHREAD2_CFLAGS) \
 	$(LIBXML2_CFLAGS) \
 	$(WARN_CFLAGS) \
-	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/libplanfahr \
 	$(NULL)
 
 LDADD = \
-	$(top_builddir)/src/libplanfahr-0.0.la \
+	$(top_builddir)/libplanfahr/libplanfahr-0.0.la \
 	$(GLIB2_LIBS) \
 	$(GIO2_LIBS) \
 	$(GOBJECT2_LIBS) \
diff --git a/src/providers/tests/hafas-bin-6-station-query-1.bin b/libplanfahr/providers/tests/hafas-bin-6-station-query-1.bin
index 87afa7f..87afa7f 100644
--- a/src/providers/tests/hafas-bin-6-station-query-1.bin
+++ b/libplanfahr/providers/tests/hafas-bin-6-station-query-1.bin
diff --git a/src/providers/tests/hafas-bin6-format.c b/libplanfahr/providers/tests/hafas-bin6-format.c
index ea5e277..ea5e277 100644
--- a/src/providers/tests/hafas-bin6-format.c
+++ b/libplanfahr/providers/tests/hafas-bin6-format.c
diff --git a/src/providers/tests/hafas-bin6.c b/libplanfahr/providers/tests/hafas-bin6.c
index 8c256e0..8c256e0 100644
--- a/src/providers/tests/hafas-bin6.c
+++ b/libplanfahr/providers/tests/hafas-bin6.c
diff --git a/run.in b/run.in
index 9c28b6b..10057ce 100755
--- a/run.in
+++ b/run.in
@@ -2,9 +2,9 @@
 
 ABS_BUILDDIR='@abs_builddir@'
 
-export GI_TYPELIB_PATH="${ABS_BUILDDIR}/src/:$GI_TYPELIB_PATH"
-export LD_LIBRARY_PATH="${ABS_BUILDDIR}/src/.libs:$LD_LIBRARY_PATH"
-export   LPF_PROVIDERS="${ABS_BUILDDIR}/src/providers/.libs"
+export GI_TYPELIB_PATH="${ABS_BUILDDIR}/libplanfahr/:$GI_TYPELIB_PATH"
+export LD_LIBRARY_PATH="${ABS_BUILDDIR}/libplanfahr/.libs:$LD_LIBRARY_PATH"
+export   LPF_PROVIDERS="${ABS_BUILDDIR}/libplanfahr/providers/.libs"
 export PKG_CONFIG_PATH="${ABS_BUILDDIR}/data/:$PKG_CONFIG_PATH"
 
 exec $@