Support building locally against header-only libraries in autowaf.

Remove CONFIG_H_PATH define and replace with just "config.h" (define messed up dependency tracking).


git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1600 a436a847-0d15-0410-975c-d299462d15a1

12 files changed, 12 insertions, 14 deletions

diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
index 72d97dc..2df0401 100644
--- a/src/JackDbusDriver.cpp
+++ b/src/JackDbusDriver.cpp
@@ -22,7 +22,7 @@
 #include <set>
 #include <iostream>
 
-#include CONFIG_H_PATH
+#include "config.h"
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 609842e..93aeec2 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <set>
 #include <iostream>
-#include CONFIG_H_PATH
+#include "config.h"
 #include <jack/jack.h>
 #include <jack/statistics.h>
 #include <jack/thread.h>
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index d9723d6..c1eb6e9 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -24,7 +24,7 @@
 #include <gtk/gtkwindow.h>
 #include <raul/SharedPtr.hpp>
 
-#include CONFIG_H_PATH
+#include "config.h"
 #include "GladeFile.hpp"
 #if defined(HAVE_JACK_DBUS)
 #include "JackDbusDriver.hpp"
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index b35e43f..199fb45 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -22,7 +22,7 @@
 #include <boost/shared_ptr.hpp>
 #include <libgnomecanvasmm.h>
 #include <libglademm/xml.h>
-#include CONFIG_H_PATH
+#include "config.h"
 #include "Widget.hpp"
 
 class PatchageCanvas;
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index 2735a61..99ee310 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <raul/SharedPtr.hpp>
-#include CONFIG_H_PATH
+#include "config.h"
 #include "PatchageCanvas.hpp"
 #include "Patchage.hpp"
 #if defined(HAVE_JACK_DBUS)
diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp
index d0a44fd..4126b17 100644
--- a/src/PatchageCanvas.hpp
+++ b/src/PatchageCanvas.hpp
@@ -18,7 +18,7 @@
 #ifndef PATCHAGE_PATCHAGECANVAS_HPP
 #define PATCHAGE_PATCHAGECANVAS_HPP
 
-#include CONFIG_H_PATH
+#include "config.h"
 #include <string>
 #ifdef HAVE_ALSA
 #include <alsa/asoundlib.h>
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index cc58350..fad8793 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include CONFIG_H_PATH
+#include "config.h"
 #include <raul/SharedPtr.hpp>
 #include "Patchage.hpp"
 #include "PatchageCanvas.hpp"
diff --git a/src/PatchageEvent.hpp b/src/PatchageEvent.hpp
index 4f39dd3..92ad7a2 100644
--- a/src/PatchageEvent.hpp
+++ b/src/PatchageEvent.hpp
@@ -22,7 +22,7 @@
 #ifdef HAVE_JACK
 #include <jack/jack.h>
 #endif
-#include CONFIG_H_PATH
+#include "config.h"
 #ifdef HAVE_ALSA
 #include <alsa/asoundlib.h>
 #endif
diff --git a/src/PatchagePort.hpp b/src/PatchagePort.hpp
index 31dcbd2..2519189 100644
--- a/src/PatchagePort.hpp
+++ b/src/PatchagePort.hpp
@@ -18,7 +18,7 @@
 #ifndef PATCHAGE_PATCHAGEPORT_HPP
 #define PATCHAGE_PATCHAGEPORT_HPP
 
-#include CONFIG_H_PATH
+#include "config.h"
 #include <string>
 #include <boost/shared_ptr.hpp>
 #include <flowcanvas/Port.hpp>
diff --git a/src/PortID.hpp b/src/PortID.hpp
index 330e6c0..dc32ec6 100644
--- a/src/PortID.hpp
+++ b/src/PortID.hpp
@@ -18,7 +18,7 @@
 #ifndef PATCHAGE_PORTID_HPP
 #define PATCHAGE_PORTID_HPP
 
-#include CONFIG_H_PATH
+#include "config.h"
 
 #include <cstring>
 #ifdef HAVE_JACK
diff --git a/src/main.cpp b/src/main.cpp
index 3c20237..a37d682 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include CONFIG_H_PATH
+#include "config.h"
 
 #include <iostream>
 #include <libgnomecanvasmm.h>
diff --git a/wscript b/wscript
index a734015..e459375 100644
--- a/wscript
+++ b/wscript
@@ -72,15 +72,13 @@ def configure(conf):
 	autowaf.check_header(conf, 'boost/weak_ptr.hpp', mandatory=True)
 	
 	conf.env['PATCHAGE_VERSION'] = PATCHAGE_VERSION
-	conf.env.append_value('CCFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"')
-	conf.env.append_value('CXXFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"')
 
 	conf.env['APP_INSTALL_NAME'] = Params.g_options.app_install_name
 	conf.env['APP_HUMAN_NAME'] = Params.g_options.app_human_name
 	conf.define('DATA_DIR', os.path.normpath(
 			conf.env['PREFIX'] + '/share/' + conf.env['APP_INSTALL_NAME']))
 	
-	conf.write_config_header('waf-config.h')
+	conf.write_config_header('config.h')
 	
 	autowaf.print_summary(conf)
 	autowaf.display_header('Patchage Configuration')