11 files changed, 34 insertions, 13 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 733d3b2f..bc56d6d9 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,8 +1,29 @@
+# -*- mode: makefile -*-
+
 headers+=$(wildcard $(TOP)/src/*/*.hpp) $(wildcard $(TOP)/src/*/*/*.hpp)
 sources+=$(wildcard $(TOP)/src/*/*.cpp) $(wildcard $(TOP)/src/*/*/*.cpp)
 
 deps:=$(sources:.cpp=.d)
 objects:=$(sources:.cpp=.o)
 
-CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -I$(TOP)/src/frames -I$(TOP)/src/utils $(shell pkg-config ftgl --cflags) -g
-LDFLAGS:=-lsqlite3 -lSDL $(shell log4cpp-config --libs) -lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lSDL_image -lSDL_gfx -lGL $(shell pkg-config ftgl --libs)
+# APPS
+PKG_CONFIG:=pkg-config
+LOG4CPP_CONFIG:=log4cpp-config
+
+# CFLAGS
+PEDENTIC:=-Wall -Werror
+DEBUG:=-g
+INC_PATH:=-I$(TOP)/src
+FTGL_CFLAGS:=$(shell $(PKG_CONFIG) ftgl --cflags)
+
+# LDFLAGS
+SQLITE_LDFLAGS:=-lsqlite3
+LOG4CPP_LDFLAGS:=$(shell $(LOG4CPP_CONFIG) --libs)
+BOOST_LDFLAGS:=-lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt
+SDL_LDFLAGS:=-lSDL -lSDL_image -lSDL_gfx
+GL_LDFLAGS:=-lGL
+FTGL_LDFLAGS:=$(shell $(PKG_CONFIG) ftgl --libs)
+
+
+CXXFLAGS:=$(PEDENTIC) $(INC_PATH) $(DEBUG) $(FTGL_CFLAGS)
+LDFLAGS:=$(SQLITE_LDFLAGS) $(LOG4CPP_LDFLAGS) $(BOOST_LDFLAGS) $(SDL_LDFLAGS) $(GL_LDFLAGS) $(FTGL_LDFLAGS)
diff --git a/src/base/image.cpp b/src/base/image.cpp
index 448f4852..1eb09ac1 100644
--- a/src/base/image.cpp
+++ b/src/base/image.cpp
@@ -24,7 +24,7 @@
  * $Id$
  */
 
-#include <image.hpp>
+#include "image.hpp"
 #include <SDL/SDL_image.h>
 #include "utils/binary_file.hpp"
 
diff --git a/src/base/songloading/songloader.hpp b/src/base/songloading/songloader.hpp
index 0f9611fe..94519993 100644
--- a/src/base/songloading/songloader.hpp
+++ b/src/base/songloading/songloader.hpp
@@ -30,7 +30,7 @@
 #include <map>
 #include <boost/filesystem.hpp>
 #include <log4cpp/Category.hh>
-#include "song.hpp"
+#include "../song.hpp"
 #include "utils/base_exception.hpp"
 #include "songloading_strategy_base_factory.hpp"
 
diff --git a/src/base/songloading/songloading_strategy.hpp b/src/base/songloading/songloading_strategy.hpp
index 3178f6ed..3c2396b8 100644
--- a/src/base/songloading/songloading_strategy.hpp
+++ b/src/base/songloading/songloading_strategy.hpp
@@ -29,7 +29,7 @@
 
 #include <string>
 #include <boost/filesystem.hpp>
-#include "song.hpp"
+#include "../song.hpp"
 
 #define _USDX_JOIN(strategy, line) _USDX_JOIN1(strategy, line)
 #define _USDX_JOIN1(strategy, line) autoregistration__strategy__##line
diff --git a/src/base/texture.hpp b/src/base/texture.hpp
index fbd88197..29e3afeb 100644
--- a/src/base/texture.hpp
+++ b/src/base/texture.hpp
@@ -35,7 +35,7 @@
 #include "utils/dimension.hpp"
 #include "utils/rectangle.hpp"
 #include "image.hpp"
-#include "drawable.hpp"
+#include "menu/drawable.hpp"
 
 namespace usdx
 {
diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp
index fac163d6..48996f1f 100644
--- a/src/frames/loading_frame.cpp
+++ b/src/frames/loading_frame.cpp
@@ -25,8 +25,8 @@
  */
 
 #include "loading_frame.hpp"
-#include "frame_background_image.hpp"
-#include "frame_background_color.hpp"
+#include "menu/frame_background_image.hpp"
+#include "menu/frame_background_color.hpp"
 
 namespace usdx
 {
diff --git a/src/frames/loading_frame.hpp b/src/frames/loading_frame.hpp
index 80ef0951..5c698d88 100644
--- a/src/frames/loading_frame.hpp
+++ b/src/frames/loading_frame.hpp
@@ -27,7 +27,7 @@
 #ifndef LOADING_FRAME_HPP
 #define LOADING_FRAME_HPP
 
-#include "frame.hpp"
+#include "menu/frame.hpp"
 #include <log4cpp/Category.hh>
 
 namespace usdx
diff --git a/src/main.cpp b/src/main.cpp
index 83fa8298..50d9d566 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,7 @@
  * $Id$
  */
 
-#include "application.hpp"
+#include "menu/application.hpp"
 #include <cstdlib>
 
 int main (int argc, char** argv)
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index d34b8003..d5f9c34f 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -28,7 +28,7 @@
 #include "event_manager.hpp"
 #include <exception>
 #include "software_mouse_pointer.hpp"
-#include "loading_frame.hpp"
+#include "frames/loading_frame.hpp"
 #include <GL/gl.h>
 #include <log4cpp/PropertyConfigurator.hh>
 
diff --git a/src/menu/frame_background_image.hpp b/src/menu/frame_background_image.hpp
index a3349574..de9103c1 100644
--- a/src/menu/frame_background_image.hpp
+++ b/src/menu/frame_background_image.hpp
@@ -31,7 +31,7 @@
 #include <GL/gl.h>
 
 #include "frame_background.hpp"
-#include "texture.hpp"
+#include "base/texture.hpp"
 
 namespace usdx
 {
diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp
index 3b29e50e..b1f40d06 100644
--- a/src/menu/software_mouse_pointer.hpp
+++ b/src/menu/software_mouse_pointer.hpp
@@ -30,7 +30,7 @@
 #include "drawable_control.hpp"
 #include "control.hpp"
 #include "event_manager.hpp"
-#include "texture.hpp"
+#include "base/texture.hpp"
 
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>