build: Get rid of #ifdef HAVE_CONFIG_H

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 3ce2cd3..4a33d31 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
        -I$(top_srcdir)/src/lib \
        @SQLITE3_CFLAGS@
 

diff --git a/src/bin/test.c b/src/bin/test.c
index ecd473c..44ec980 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -20,10 +20,6 @@
  * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <lightmediascanner.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ebcdb8f..5368f40 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib @SQLITE3_CFLAGS@
+AM_CPPFLAGS = -include $(top_builddir)/config.h \
+               -I$(top_srcdir)/src/lib @SQLITE3_CFLAGS@
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
 

diff --git a/src/lib/lightmediascanner.c b/src/lib/lightmediascanner.c
index bd2ac0b..0a7b8fc 100644 (file)
--- a/src/lib/lightmediascanner.c
+++ b/src/lib/lightmediascanner.c
@@ -20,10 +20,6 @@
  * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/lib/lightmediascanner_check.c b/src/lib/lightmediascanner_check.c
index c7f6a34..494427b 100644 (file)
--- a/src/lib/lightmediascanner_check.c
+++ b/src/lib/lightmediascanner_check.c
@@ -20,10 +20,6 @@
  * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _GNU_SOURCE
 #include <sys/wait.h>
 #include <sys/stat.h>

diff --git a/src/lib/lightmediascanner_process.c b/src/lib/lightmediascanner_process.c
index a6a2bc5..8f64eeb 100644 (file)
--- a/src/lib/lightmediascanner_process.c
+++ b/src/lib/lightmediascanner_process.c
@@ -20,10 +20,6 @@
  * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _GNU_SOURCE
 #include <sys/wait.h>
 #include <sys/stat.h>

diff --git a/src/plugins/asf/asf.c b/src/plugins/asf/asf.c
index 88bb3df..7f442d6 100644 (file)
--- a/src/plugins/asf/asf.c
+++ b/src/plugins/asf/asf.c
@@ -24,10 +24,6 @@
  * asf/wma file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #define _BSD_SOURCE
 #include <lightmediascanner_plugin.h>

diff --git a/src/plugins/audio-dummy/audio-dummy.c b/src/plugins/audio-dummy/audio-dummy.c
index 39dd253..238cfb5 100644 (file)
--- a/src/plugins/audio-dummy/audio-dummy.c
+++ b/src/plugins/audio-dummy/audio-dummy.c
@@ -26,10 +26,6 @@
  * Audio Dummy plugin, just register matched extensions in audios DB.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_db.h>

diff --git a/src/plugins/dummy/dummy.c b/src/plugins/dummy/dummy.c
index ff7998d..8aed963 100644 (file)
--- a/src/plugins/dummy/dummy.c
+++ b/src/plugins/dummy/dummy.c
@@ -26,10 +26,6 @@
  * Dummy plugin that stores all files in the database.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <sys/types.h>

diff --git a/src/plugins/flac/flac.c b/src/plugins/flac/flac.c
index 6d7cbeb..65f312f 100644 (file)
--- a/src/plugins/flac/flac.c
+++ b/src/plugins/flac/flac.c
@@ -24,10 +24,6 @@
  * flac file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_db.h>
 #include <stdio.h>

diff --git a/src/plugins/id3/id3.c b/src/plugins/id3/id3.c
index a1c6d11..5a57f60 100644 (file)
--- a/src/plugins/id3/id3.c
+++ b/src/plugins/id3/id3.c
@@ -27,10 +27,6 @@
  * id3 file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _GNU_SOURCE
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>

diff --git a/src/plugins/jpeg/jpeg.c b/src/plugins/jpeg/jpeg.c
index ac0c30e..06978ee 100644 (file)
--- a/src/plugins/jpeg/jpeg.c
+++ b/src/plugins/jpeg/jpeg.c
@@ -29,10 +29,6 @@
  * @todo: check if worth using mmap().
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_utils.h>

diff --git a/src/plugins/m3u/m3u.c b/src/plugins/m3u/m3u.c
index 15a92df..29ea3ce 100644 (file)
--- a/src/plugins/m3u/m3u.c
+++ b/src/plugins/m3u/m3u.c
@@ -26,10 +26,6 @@
  * m3u playlist parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_db.h>

diff --git a/src/plugins/mp4/mp4.c b/src/plugins/mp4/mp4.c
index 16c7f63..c335232 100644 (file)
--- a/src/plugins/mp4/mp4.c
+++ b/src/plugins/mp4/mp4.c
@@ -24,10 +24,6 @@
  * mp4 file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 static const char PV[] = PACKAGE_VERSION; /* mp4.h screws PACKAGE_VERSION */
 
 #include <lightmediascanner_plugin.h>

diff --git a/src/plugins/ogg/lms_ogg_tremor.c b/src/plugins/ogg/lms_ogg_tremor.c
index f0b2234..dd51e86 100644 (file)
--- a/src/plugins/ogg/lms_ogg_tremor.c
+++ b/src/plugins/ogg/lms_ogg_tremor.c
@@ -19,10 +19,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <tremor/ogg.h>
 
 #include "lms_ogg_private.h"

diff --git a/src/plugins/ogg/lms_ogg_vorbis.c b/src/plugins/ogg/lms_ogg_vorbis.c
index 64dfe91..2eb6933 100644 (file)
--- a/src/plugins/ogg/lms_ogg_vorbis.c
+++ b/src/plugins/ogg/lms_ogg_vorbis.c
@@ -19,10 +19,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <ogg/ogg.h>
 

diff --git a/src/plugins/ogg/ogg.c b/src/plugins/ogg/ogg.c
index e4c328f..ed53fb1 100644 (file)
--- a/src/plugins/ogg/ogg.c
+++ b/src/plugins/ogg/ogg.c
@@ -26,10 +26,6 @@
  * ogg file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_db.h>
 #include <lightmediascanner_utils.h>

diff --git a/src/plugins/pls/pls.c b/src/plugins/pls/pls.c
index d2a253c..3531a45 100644 (file)
--- a/src/plugins/pls/pls.c
+++ b/src/plugins/pls/pls.c
@@ -33,10 +33,6 @@
  * In theory this should not happen, so let's wait for bug reports.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_db.h>

diff --git a/src/plugins/png/png.c b/src/plugins/png/png.c
index 46a46f1..1e9f697 100644 (file)
--- a/src/plugins/png/png.c
+++ b/src/plugins/png/png.c
@@ -27,10 +27,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_utils.h>

diff --git a/src/plugins/rm/rm.c b/src/plugins/rm/rm.c
index 1fcb38e..088f3ae 100644 (file)
--- a/src/plugins/rm/rm.c
+++ b/src/plugins/rm/rm.c
@@ -24,10 +24,6 @@
  * real media file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #define _BSD_SOURCE
 #include <lightmediascanner_plugin.h>

diff --git a/src/plugins/video-dummy/video-dummy.c b/src/plugins/video-dummy/video-dummy.c
index c127e29..5d1c623 100644 (file)
--- a/src/plugins/video-dummy/video-dummy.c
+++ b/src/plugins/video-dummy/video-dummy.c
@@ -26,10 +26,6 @@
  * Video Dummy plugin, just register matched extensions in videos DB.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>
 #include <lightmediascanner_db.h>

diff --git a/src/plugins/wave/wave.c b/src/plugins/wave/wave.c
index 67fb35d..c549d00 100644 (file)
--- a/src/plugins/wave/wave.c
+++ b/src/plugins/wave/wave.c
@@ -25,10 +25,6 @@
  * wave file parser.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define _GNU_SOURCE
 #define _XOPEN_SOURCE 600
 #include <lightmediascanner_plugin.h>