Updated autoconf build to support new headers, and fixed python impor…

…ts and tests
ksterker · Jul 28, 2012 · 3aa69cc · 3aa69cc
1 parent 4e5dc77
commit 3aa69cc
Show file tree

Hide file tree

Showing 35 changed files with 149 additions and 123 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -5,10 +5,16 @@ EXTRA_DIST = adonthell.pc.in adonthell.pc.cmake autogen.sh README.Win32 \
     config/UsePkgConfig.cmake config/PythonExtraLibs.cmake config.h.cmake \
     scripts/make-bundle.sh README.MacOSX 
 
-SUBDIRS = src doc test
+SUBDIRS = . src doc test
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = adonthell.pc
 
 $(pkgconfig_DATA): config.status
 
+all-local:
+	ln -fs $(top_srcdir)/src $(top_builddir)/adonthell
+
+clean-local:
+	rm -f $(top_builddir)/adonthell
+
diff --git a/adonthell.pc.cmake b/adonthell.pc.cmake
@@ -8,5 +8,5 @@ Name: Adonthell
 Description: Role Playing Game Engine
 Version: @VERSION@
 Libs: -L${libdir} -ladonthell_py_runtime -ladonthell_base -ladonthell_python -ladonthell_gfx -ladonthell_input -ladonthell_event -ladonthell_rpg -ladonthell_world
-Cflags: -I${includedir}/adonthell
+Cflags: -I${includedir}/adonthell-@VERSION@
 
diff --git a/adonthell.pc.in b/adonthell.pc.in
@@ -8,5 +8,5 @@ Name: Adonthell
 Description: Role Playing Game Engine
 Version: @VERSION@
 Libs: -L${libdir} -ladonthell_py_runtime -ladonthell_base -ladonthell_python -ladonthell_gfx -ladonthell_input -ladonthell_event -ladonthell_rpg -ladonthell_world 
-Cflags: -I${includedir}/adonthell
+Cflags: -I${includedir}/adonthell-@VERSION@
 
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
@@ -1,9 +1,11 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
-DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)
+AM_CXXFLAGS = -I$(top_builddir)
+DEFAULT_INCLUDES = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludeaudiodir = $(pkgincludedir)/audio
+pkgincludeaudiodir = $(adonthellincludedir)/audio
 pkgincludeaudio_HEADERS = \
 	audio.h \
 	audio_event.h \
@@ -36,7 +38,7 @@ pkglibaudio_LTLIBRARIES = _sdl.la
 
 ### SDL backend
 ## Our header files
-pkgincludeaudiosdldir = $(pkgincludedir)/audio/sdl
+pkgincludeaudiosdldir = $(adonthellincludedir)/audio/sdl
 
 ## Rules to build libaudio_sdl
 _sdl_la_SOURCES = \

diff --git a/src/audio/sdl/audio_sdl.cc b/src/audio/sdl/audio_sdl.cc
@@ -34,9 +34,9 @@
 #include "SDL.h"
 #include "SDL_mixer.h"
 
-#include "audio/sound.h"
-#include "audio/audio.h"
-#include "base/logging.h"
+#include <adonthell/audio/sound.h>
+#include <adonthell/audio/audio.h>
+#include <adonthell/base/logging.h>
 
 //TODO These values should be gotten from a config file or something
 int audio_rate = 44100;

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
@@ -1,9 +1,11 @@
 backenddir = @backenddir@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludebasedir = $(pkgincludedir)/base
+pkgincludebasedir = $(adonthellincludedir)/base
 pkgincludebase_HEADERS = \
 	base.h \
 	callback.h \

diff --git a/src/event/Makefile.am b/src/event/Makefile.am
@@ -1,9 +1,11 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
-DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)
+AM_CXXFLAGS = -I$(top_builddir)
+DEFAULT_INCLUDES = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludeeventdir = $(pkgincludedir)/event
+pkgincludeeventdir = $(adonthellincludedir)/event
 pkgincludeevent_HEADERS = \
 	date.h \
 	event.h \

diff --git a/src/gfx/Makefile.am b/src/gfx/Makefile.am
@@ -1,13 +1,15 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
-DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)
+AM_CXXFLAGS = -I$(top_builddir)
+DEFAULT_INCLUDES = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt sdlgl/screen_sdlgl.h sdlgl/surface_sdlgl.h sdlgl/gfx_sdlgl.cc \
 	sdlgl/screen_sdlgl.cc sdlgl/surface_sdlgl.cc sdl/screen_sdl.h sdl/surface_sdl.h \
 	sdl/gfx_sdl.cc sdl/screen_sdl.cc sdl/surface_sdl.cc sdl2/screen_sdl.h sdl2/surface_sdl.h \
 	sdl2/gfx_sdl.cc sdl2/screen_sdl.cc sdl2/surface_sdl.cc
 
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludegfxdir = $(pkgincludedir)/gfx
+pkgincludegfxdir = $(adonthellincludedir)/gfx
 pkgincludegfx_HEADERS = \
 	drawable.h \
 	drawing_area.h \

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
@@ -1,9 +1,11 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
-DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir) $(FT2_CFLAGS)
+AM_CXXFLAGS = -I$(top_builddir)
+DEFAULT_INCLUDES = -I$(top_builddir) $(FT2_CFLAGS)
 EXTRA_DIST = CMakeLists.txt
 
-pkgincludeinputdir = $(pkgincludedir)/gui
-pkgincludeinput_HEADERS = \
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
+pkgincludeguidir = $(adonthellincludedir)/gui
+pkgincludegui_HEADERS = \
 	button.h \
 	canvas.h \
     conversation.h \

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
@@ -1,12 +1,14 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
-DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)
+AM_CXXFLAGS = -I$(top_builddir)
+DEFAULT_INCLUDES = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt sdl/manager_sdl.h sdl/input_sdl.cc \
 	sdl/manager_sdl.cc sdl2/manager_sdl.h sdl2/input_sdl.cc \
 	sdl2/manager_sdl.cc
 
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludeinputdir = $(pkgincludedir)/input
+pkgincludeinputdir = $(adonthellincludedir)/input
 pkgincludeinput_HEADERS = \
 	input.h \
 	control_event.h \
@@ -41,7 +43,7 @@ pkglibinput_LTLIBRARIES = _sdl.la
 
 ### SDL backend
 ## Our header files
-pkgincludeinputsdldir = $(pkgincludedir)/input/sdl
+pkgincludeinputsdldir = $(adonthellincludedir)/input/sdl
 pkgincludeinputsdl_HEADERS = \
     $(sdlbackenddir)/manager_sdl.h
 

diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -1,8 +1,10 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt sdl/linux.cc sdl/winnt.cc sdl/osx.h sdl/osx.m
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludemaindir = $(pkgincludedir)/main/
+pkgincludemaindir = $(adonthellincludedir)/main/
 pkgincludemain_HEADERS = \
 	adonthell.h
 

diff --git a/src/py-runtime/Makefile.am b/src/py-runtime/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 EXTRA_DIST = py_runtime.i CMakeLists.txt
 CLEANFILES = $(top_srcdir)/src/py-runtime/py_runtime.cc
 

diff --git a/src/py-wrappers/adonthell/Makefile.am b/src/py-wrappers/adonthell/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 EXTRA_DIST = py_debug.i py_base.i py_event.i py_gfx.i py_gui.i py_input.i py_audio.i py_main.i py_rpg.i py_world.i CMakeLists.txt
 CLEANFILES = $(top_srcdir)/src/py-wrappers/adonthell/py_debug_wrap.cc \
     $(top_srcdir)/src/py-wrappers/adonthell/py_base_wrap.cc \
@@ -123,7 +123,7 @@ _debug_la_LIBADD = $(PY_LIBADD) \
 	$(PY_RUNTIME)
 
 ## Swig arguments
-SWIG_ARGS = -python -modern -noexcept -I$(top_srcdir)/src
+SWIG_ARGS = -python -modern -noexcept -I$(top_builddir)
 
 ## Rules for Python wrappers generation
 base.py: py_base_wrap.cc

diff --git a/src/py-wrappers/adonthell/py_audio.i b/src/py-wrappers/adonthell/py_audio.i
@@ -27,7 +27,7 @@ extern "C" {
 %include "std_string.i"
 
 %import "py_event.i"    // since audio_event inherits from event
-%import "base/types.h"
+%import <adonthell/base/types.h>
 
 %include <adonthell/audio/audio.h>
 %include <adonthell/audio/sound.h>

diff --git a/src/py-wrappers/adonthell/py_event.i b/src/py-wrappers/adonthell/py_event.i
@@ -31,7 +31,7 @@ namespace events {
     }
 }
 
-%import "base/types.h"
+%import <adonthell/base/types.h>
 %include <adonthell/event/date.h>
 %include <adonthell/event/event.h>
 %include <adonthell/event/time_event.h>

diff --git a/src/py-wrappers/adonthell/py_gfx.i b/src/py-wrappers/adonthell/py_gfx.i
@@ -20,7 +20,7 @@ extern "C" {
 %include "stdint.i"
 %include "std_string.i"
 
-%import "base/types.h"
+%import <adonthell/base/types.h>
 %include <adonthell/gfx/gfx.h>
 %include <adonthell/gfx/drawing_area.h>
 %include <adonthell/gfx/drawable.h>

diff --git a/src/py-wrappers/adonthell/py_gui.i b/src/py-wrappers/adonthell/py_gui.i
@@ -94,9 +94,9 @@ namespace gui {
     }
 }
 
-%import "base/types.h"
-%import(module="gfx") "gfx/drawable.h"
-%import(module="event") "event/event.h"
+%import <adonthell/base/types.h>
+%import(module="gfx") <adonthell/gfx/drawable.h>
+%import(module="event") <adonthell/event/event.h>
 
 %include <adonthell/gui/widget.h>
 %include <adonthell/gui/font.h>

diff --git a/src/py-wrappers/adonthell/py_input.i b/src/py-wrappers/adonthell/py_input.i
@@ -21,7 +21,7 @@ extern "C" {
 %include "stdint.i"
 %include "std_string.i"
 
-%import "base/types.h"
+%import <adonthell/base/types.h>
 %include <adonthell/input/input.h>
 %include <adonthell/input/event.h>
 %include <adonthell/input/keyboard_event.h>

diff --git a/src/py-wrappers/adonthell/py_rpg.i b/src/py-wrappers/adonthell/py_rpg.i
@@ -86,8 +86,8 @@ namespace rpg {
 
 %typemap(freearg) const std::vector<std::string> & "delete $1;"
 
-%import "base/types.h"
-%import(module="event") "event/event.h"
+%import <adonthell/base/types.h>
+%import(module="event") <adonthell/event/event.h>
 %include <adonthell/python/script.h>
 %include <adonthell/rpg/item.h>
 %include <adonthell/rpg/slot.h>

diff --git a/src/py-wrappers/adonthell/py_world.i b/src/py-wrappers/adonthell/py_world.i
@@ -25,9 +25,9 @@ extern "C" {
 %include "stdint.i"
 %include "std_string.i"
 
-%import "base/types.h"
-%import(module="event") "event/event.h"
-%import(module="gfx") "gfx/drawable.h"
+%import <adonthell/base/types.h>
+%import(module="event") <adonthell/event/event.h>
+%import(module="gfx") <adonthell/gfx/drawable.h>
 
 // typemap for returning a string pointer as python string
 %typemap(out) std::string * {

diff --git a/src/python/Makefile.am b/src/python/Makefile.am
@@ -1,9 +1,11 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 DEFAULT_INCLUDES = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludepythondir = $(pkgincludedir)/python
+pkgincludepythondir = $(adonthellincludedir)/python
 pkgincludepython_HEADERS = \
 	callback_support.h \
 	callback.h \

diff --git a/src/rpg/Makefile.am b/src/rpg/Makefile.am
@@ -1,8 +1,10 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincluderpgdir = $(pkgincludedir)/rpg
+pkgincluderpgdir = $(adonthellincludedir)/rpg
 pkgincluderpg_HEADERS = \
     character.h \
     dialog.h \

diff --git a/src/world/Makefile.am b/src/world/Makefile.am
@@ -1,8 +1,10 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 EXTRA_DIST = CMakeLists.txt
 
+adonthellincludedir = $(pkgincludedir)-@VERSION@/adonthell
+
 ## Our header files
-pkgincludeworlddir = $(pkgincludedir)/world
+pkgincludeworlddir = $(adonthellincludedir)/world
 pkgincludeworld_HEADERS = \
     action.h \
     area.h \

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_builddir)
 
 SUBDIRS = data
 
@@ -22,7 +22,7 @@ callbacktest_LDADD = -L$(top_builddir)/src/base/ -ladonthell_base
 diskiotest_SOURCES = diskiotest.cc
 diskiotest_LDADD = -L$(top_builddir)/src/base/ -ladonthell_base
 
-guitest_CXXFLAGS = $(FT2_CFLAGS) -I$(top_srcdir)/src $(PY_CFLAGS)
+guitest_CXXFLAGS = $(FT2_CFLAGS) -I$(top_builddir) $(PY_CFLAGS)
 guitest_SOURCES = guitest.cc
 guitest_LDADD = \
 	-L$(top_builddir)/src/python/ -ladonthell_python $(PY_LIBS)\

diff --git a/test/audiotest.cc b/test/audiotest.cc
@@ -1,7 +1,7 @@
-#include "audio/audio.h"
-#include "audio/audio_manager.h"
-#include "base/configuration.h"
-#include "base/logging.h"
+#include <adonthell/audio/audio.h>
+#include <adonthell/audio/audio_manager.h>
+#include <adonthell/base/configuration.h>
+#include <adonthell/base/logging.h>
 
 #include <iostream>
 

diff --git a/test/callbacktest.cc b/test/callbacktest.cc
@@ -1,6 +1,6 @@
 #include <iostream>
-#include "base/base.h"
-#include "base/serializer.h"
+#include <adonthell/base/base.h>
+#include <adonthell/base/serializer.h>
 
 
 class calltest

diff --git a/test/dialogtest.cc b/test/dialogtest.cc
@@ -3,13 +3,13 @@ using std::cout;
 using std::endl;
 using std::cin;
 #include <sstream>
-#include "base/base.h"
-#include "gfx/gfx.h"
-#include "input/input.h"
-#include "gui/gui.h"
-#include "main/adonthell.h"
-#include "gui/draw.h"
-#include "rpg/dialog.h"
+#include <adonthell/base/base.h>
+#include <adonthell/gfx/gfx.h>
+#include <adonthell/input/input.h>
+#include <adonthell/gui/gui.h>
+#include <adonthell/main/adonthell.h>
+#include <adonthell/gui/draw.h>
+#include <adonthell/rpg/dialog.h>
 
 class InputHandler {
 private:

diff --git a/test/diskiotest.cc b/test/diskiotest.cc
@@ -1,4 +1,4 @@
-#include "base/diskio.h"
+#include <adonthell/base/diskio.h>
 #include <iostream>
 
 using std::cout;

diff --git a/test/gfxtest.cc b/test/gfxtest.cc
@@ -1,6 +1,6 @@
 #include <iostream>
-#include "gfx/gfx.h"
-#include "base/timer.h"
+#include <adonthell/gfx/gfx.h>
+#include <adonthell/base/timer.h>
 
 //#include "main/adonthell.h"
 

diff --git a/test/guitest.cc b/test/guitest.cc
@@ -4,12 +4,12 @@
 
 using std::string;
 
-#include "base/base.h"
-#include "event/factory.h"
-#include "gfx/gfx.h"
-#include "input/input.h"
-#include "gui/gui.h"
-#include "main/adonthell.h"
+#include <adonthell/base/base.h>
+#include <adonthell/event/factory.h>
+#include <adonthell/gfx/gfx.h>
+#include <adonthell/input/input.h>
+#include <adonthell/gui/gui.h>
+#include <adonthell/main/adonthell.h>
 
 class InputHandler {
 private: