src/aubio.h: do not include config.h, do not install it

diff --git a/src/Makefile.am b/src/Makefile.am
index 1593a5b52a29d4eb97ac1423e393444d13bf2f36..cff551ed9f8a5130ed2cc0710875b69fada7ed9f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ nobase_pkginclude_HEADERS = \
        tempo/tempo.h \
        tempo/beattracking.h
 
-nodist_pkginclude_HEADERS = config.h
+nodist_noinst_HEADERS = config.h
 
 lib_LTLIBRARIES = libaubio.la 
 libaubio_la_SOURCES = \

diff --git a/src/aubio.h b/src/aubio.h
index fe3d160b55c05d3c36f086742eb45aa8a4596994..3079e75b676d1fcae60d6f8866775745403525da 100644 (file)
--- a/src/aubio.h
+++ b/src/aubio.h
@@ -152,9 +152,6 @@ extern "C"
 {
 #endif
 
-/* first the generated config file */
-#include "config.h"
-
 /* in this order */
 #include "types.h"
 #include "fvec.h"

diff --git a/src/wscript_build b/src/wscript_build
index e88e06312f4260f5bc2af2403b4ab241cbe700d1..e4282cfe8e1f603c83ebdf7cda76926657b79909 100644 (file)
--- a/src/wscript_build
+++ b/src/wscript_build
@@ -9,5 +9,5 @@ libaubio = bld.new_task_gen(
 
 # install headers, except _priv.h ones
 for file in bld.path.ant_glob('**/*.h').split():
-  if '_priv.h' in file: continue
+  if '_priv.h' in file or file == 'config.h': continue
   bld.install_as('${PREFIX}/include/aubio/' + file, file)