make Michael Stahl happy

17 files changed, 19 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index bce610a..3dd5125 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ pkgconfdir = $(libdir)/pkgconfig
 
 pkgconf_DATA = libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.pc
 
-SUBDIRS = src build docs
+SUBDIRS = inc src build docs
 
 EXTRA_DIST = \
 	AUTHORS \
diff --git a/configure.ac b/configure.ac
index d841d15..22003c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,6 +191,8 @@ AM_CONDITIONAL([WITH_LIBPGPLUS_DOCS], [test "x$build_docs" != "xno"])
 # =====================
 AC_CONFIG_FILES([
 Makefile
+inc/Makefile
+inc/libpgplus/Makefile
 src/Makefile
 src/conv/Makefile
 src/conv/raw/Makefile
diff --git a/inc/.gitignore b/inc/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/inc/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/inc/Makefile.am b/inc/Makefile.am
new file mode 100644
index 0000000..2f7c62a
--- /dev/null
+++ b/inc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libpgplus
diff --git a/inc/libpgplus/Makefile.am b/inc/libpgplus/Makefile.am
new file mode 100644
index 0000000..def5536
--- /dev/null
+++ b/inc/libpgplus/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+	libpgplus.h \
+	PGPLUSDocument.h \
+	PGPLUSStringVector.h
diff --git a/src/lib/PGPLUSDocument.h b/inc/libpgplus/PGPLUSDocument.h
index 7ca2be1..7ca2be1 100644
--- a/src/lib/PGPLUSDocument.h
+++ b/inc/libpgplus/PGPLUSDocument.h
diff --git a/src/lib/PGPLUSStringVector.h b/inc/libpgplus/PGPLUSStringVector.h
index b18ec59..b18ec59 100644
--- a/src/lib/PGPLUSStringVector.h
+++ b/inc/libpgplus/PGPLUSStringVector.h
diff --git a/src/lib/libpgplus.h b/inc/libpgplus/libpgplus.h
index 17453e2..17453e2 100644
--- a/src/lib/libpgplus.h
+++ b/inc/libpgplus/libpgplus.h
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index ba089b5..a1d95a4 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = ppp2raw
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
 
 ppp2raw_DEPENDENCIES = @PPP2RAW_WIN32_RESOURCE@
 
diff --git a/src/conv/raw/ppp2raw.cpp b/src/conv/raw/ppp2raw.cpp
index a5226e1..9033b1f 100644
--- a/src/conv/raw/ppp2raw.cpp
+++ b/src/conv/raw/ppp2raw.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libpgplus.h"
+#include <libpgplus/libpgplus.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 #include <libwpg/libwpg.h>
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 02bbec1..29305b5 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = ppp2xhtml
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
 
 ppp2xhtml_DEPENDENCIES = @PPP2XHTML_WIN32_RESOURCE@
 
diff --git a/src/conv/svg/ppp2xhtml.cpp b/src/conv/svg/ppp2xhtml.cpp
index 6d4f303..7b54a16 100644
--- a/src/conv/svg/ppp2xhtml.cpp
+++ b/src/conv/svg/ppp2xhtml.cpp
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
-#include "libpgplus.h"
+#include <libpgplus/libpgplus.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d12617d..d508970 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,12 +6,8 @@ endif
 
 lib_LTLIBRARIES = libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.la
 libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_includedir = $(includedir)/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@/libpgplus
-libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_include_HEADERS = \
-	libpgplus.h \
-	PGPLUSDocument.h \
-	PGPLUSStringVector.h
 
-AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
 
 libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_LIBADD  = $(WPD_LIBS) $(WPG_LIBS) @LIBPGPLUS_WIN32_RESOURCE@
 libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_DEPENDENCIES = @LIBPGPLUS_WIN32_RESOURCE@
diff --git a/src/lib/PGPLUSDocument.cpp b/src/lib/PGPLUSDocument.cpp
index 5c26457..7273642 100644
--- a/src/lib/PGPLUSDocument.cpp
+++ b/src/lib/PGPLUSDocument.cpp
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <string>
 #include <string.h>
-#include "PGPLUSDocument.h"
+#include <libpgplus/PGPLUSDocument.h>
 #include "PGPLUSSVGGenerator.h"
 #include "libpgplus_utils.h"
 
diff --git a/src/lib/PGPLUSSVGGenerator.cpp b/src/lib/PGPLUSSVGGenerator.cpp
index 75bf65d..240cf8d 100644
--- a/src/lib/PGPLUSSVGGenerator.cpp
+++ b/src/lib/PGPLUSSVGGenerator.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "PGPLUSSVGGenerator.h"
-#include "libpgplus.h"
+#include <libpgplus/libpgplus.h>
 #include <locale.h>
 #include <sstream>
 #include <string>
diff --git a/src/lib/PGPLUSSVGGenerator.h b/src/lib/PGPLUSSVGGenerator.h
index 42b87cb..94723ce 100644
--- a/src/lib/PGPLUSSVGGenerator.h
+++ b/src/lib/PGPLUSSVGGenerator.h
@@ -35,7 +35,7 @@
 #include <sstream>
 #include <libwpd/libwpd.h>
 #include <libwpg/libwpg.h>
-#include "PGPLUSStringVector.h"
+#include <libpgplus/PGPLUSStringVector.h>
 
 namespace libpgplus
 {
diff --git a/src/lib/PGPLUSStringVector.cpp b/src/lib/PGPLUSStringVector.cpp
index a950185..eb4dfdc 100644
--- a/src/lib/PGPLUSStringVector.cpp
+++ b/src/lib/PGPLUSStringVector.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <vector>
-#include "PGPLUSStringVector.h"
+#include <libpgplus/PGPLUSStringVector.h>
 
 namespace libpgplus
 {