Fix Makefiles so that local headers are always preferred over system …

…headers. Closes: #64.
audacious-media-player · Feb 1, 2012 · bd57afc · bd57afc
1 parent c36b8fb
commit bd57afc
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 35 deletions.
diff --git a/src/audacious/Makefile b/src/audacious/Makefile
@@ -90,15 +90,14 @@ endif
 include ../../buildsys.mk
 
 ifeq ($(USE_DBUS),yes)
-CPPFLAGS += -I../libaudclient
 DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
-LIBS += -L../libaudclient -laudclient
+LIBS := -L../libaudclient -laudclient ${LIBS}
 endif
 
 pre-depend: ${DBUS_BINDINGS}
 
-CPPFLAGS += \
-            -DHAVE_CONFIG_H \
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
 		${GLIB_CFLAGS}			\
 		${GTHREAD_CFLAGS} \
 		${GTK_CFLAGS}			\
@@ -108,17 +107,15 @@ CPPFLAGS += \
 		${PTHREAD_CFLAGS}		\
 		-D_AUDACIOUS_CORE		\
 		${EGGSM_CFLAGS}			\
-		${LIBGUESS_CFLAGS}		\
-		-I.. -I../..
+		${LIBGUESS_CFLAGS}
 
 # Essential for efficient FFTs. --jlindgren
 CFLAGS += -ffast-math
 
-LIBS += ${LDADD}						\
-        -lm \
-		-L../libaudcore -laudcore	\
-		-L../libaudgui -laudgui \
-		-L../libaudtag -laudtag		\
+LIBS := -L../libaudcore -laudcore \
+        -L../libaudgui -laudgui \
+        -L../libaudtag -laudtag \
+        ${LIBS} -lm \
 		${LIBINTL}						\
 		${EGGSM_LIBS}					\
 		${GLIB_LIBS}					\

diff --git a/src/audacious/main.c b/src/audacious/main.c
@@ -39,7 +39,7 @@
 #include "config.h"
 
 #ifdef USE_DBUS
-#include "audctrl.h"
+#include "../libaudclient/audctrl.h"
 #include "dbus.h"
 #endif
 

diff --git a/src/audacious/util.c b/src/audacious/util.c
@@ -35,10 +35,6 @@
 #include <mach-o/dyld.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
@@ -48,6 +44,7 @@
 
 #include <libaudcore/audstrings.h>
 
+#include "config.h"
 #include "debug.h"
 #include "i18n.h"
 #include "misc.h"

diff --git a/src/audtool/Makefile b/src/audtool/Makefile
@@ -11,9 +11,13 @@ SRCS = main.c				\
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += -I.. -I../.. \
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
             ${AUDACIOUS_DEFINES} \
             ${DBUS_CFLAGS} \
             ${GTK_CFLAGS}
 
-LIBS += -L../libaudclient -laudclient ${DBUS_LIBS} ${GTK_LIBS}
+LIBS := -L../libaudclient -laudclient \
+        ${LIBS} \
+        ${DBUS_LIBS} \
+        ${GTK_LIBS}
diff --git a/src/libaudclient/Makefile b/src/libaudclient/Makefile
@@ -12,9 +12,12 @@ include ../../extra.mk
 pre-depend:
 	cd ../audacious; ${MAKE} ${MFLAGS} dbus-client-bindings.h
 
-CPPFLAGS = ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../..
-CFLAGS += ${LIB_CFLAGS}		\
-	  ${GLIB_CFLAGS}	\
-	  ${DBUS_CFLAGS}
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
+            ${DBUS_CFLAGS} \
+            ${GLIB_CFLAGS}
+
+CFLAGS += ${LIB_CFLAGS}
+
 LIBS += ${GLIB_LIBS}	\
 	${DBUS_LIBS}
diff --git a/src/libaudcore/Makefile b/src/libaudcore/Makefile
@@ -29,7 +29,11 @@ include ../../extra.mk
 
 includesubdir = libaudcore
 
-CPPFLAGS += -DHAVE_CONFIG_H ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} -I.. -I../..
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
+            ${GLIB_CFLAGS} \
+            ${PTHREAD_CFLAGS}
+
 CFLAGS += ${LIB_CFLAGS}
 
 LIBS += ${PTHREAD_LIBS} ${GLIB_LIBS} -lm
diff --git a/src/libaudgui/Makefile b/src/libaudgui/Makefile
@@ -32,6 +32,16 @@ include ../../extra.mk
 
 includesubdir = libaudgui
 
-CPPFLAGS += -DHAVE_CONFIG_H -I.. -I../.. ${GLIB_CFLASG} ${GTK_CFLAGS} ${DBUS_CFLAGS} ${AUDACIOUS_DEFINES} ${REGEX_CFLAGS}
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
+            ${GLIB_CFLASG} \
+            ${GTK_CFLAGS} \
+            ${REGEX_CFLAGS}
+
 CFLAGS += ${LIB_CFLAGS}
-LIBS += -lm ${GLIB_LIBS} ${GTK_LIBS} ${REGEX_LIBS} -L../libaudcore -laudcore
+
+LIBS := -L../libaudcore -laudcore \
+        ${LIBS} -lm \
+        ${GLIB_LIBS} \
+        ${GTK_LIBS} \
+        ${REGEX_LIBS}
diff --git a/src/libaudgui/ui_jumptotrack_cache.c b/src/libaudgui/ui_jumptotrack_cache.c
@@ -18,10 +18,6 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <glib.h>
 
 #include <stdlib.h>
@@ -34,6 +30,7 @@
 #include <audacious/debug.h>
 #include <audacious/playlist.h>
 
+#include "config.h"
 #include "ui_jumptotrack_cache.h"
 #include "ui_regex.h"
 

diff --git a/src/libaudgui/ui_urlopener.c b/src/libaudgui/ui_urlopener.c
@@ -20,10 +20,6 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <glib.h>
 #include <gtk/gtk.h>
 
@@ -32,6 +28,7 @@
 #include <audacious/drct.h>
 #include <audacious/misc.h>
 
+#include "config.h"
 #include "libaudgui.h"
 #include "libaudgui-gtk.h"
 

diff --git a/src/libaudtag/Makefile b/src/libaudtag/Makefile
@@ -16,6 +16,12 @@ INCLUDES = audtag.h
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${GLIB_CFLAGS} -D_AUDACIOUS_CORE -I.. -I../..
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
+            ${GLIB_CFLAGS}
+
 CFLAGS += ${LIB_CFLAGS}
-LIBS += ${GLIB_LIBS} -L../libaudcore -laudcore
+
+LIBS := -L../libaudcore -laudcore \
+        ${LIBS} \
+        ${GLIB_LIBS}