Do not include config.h from C files. Include it from the compiler co…

…mmand line instead.
frank-zago · Feb 7, 2011 · d9659a0 · d9659a0
1 parent eeca060
commit d9659a0
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 16 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = xgalaga-sdl
 
 xgalaga_sdl_LDADD = @SDL_LIBS@
-xgalaga_sdl_CFLAGS = -DDATADIR=\"@datadir@\" @SDL_CPPFLAGS@
+xgalaga_sdl_CFLAGS = -include config.h -DDATADIR=\"@datadir@\" @SDL_CPPFLAGS@
 
 xgalaga_sdl_SOURCES = \
 	SFont.c \

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -177,7 +177,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xgalaga_sdl_LDADD = @SDL_LIBS@
-xgalaga_sdl_CFLAGS = -DDATADIR=\"@datadir@\" @SDL_CPPFLAGS@
+xgalaga_sdl_CFLAGS = -include config.h -DDATADIR=\"@datadir@\" @SDL_CPPFLAGS@
 xgalaga_sdl_SOURCES = \
 	SFont.c \
 	SFont.h \

diff --git a/src/highscore.c b/src/highscore.c
@@ -19,8 +19,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>

diff --git a/src/images.c b/src/images.c
@@ -20,8 +20,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
 

diff --git a/src/joystick.c b/src/joystick.c
@@ -19,8 +19,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include "xgalaga.h"
 
 static SDL_Joystick *js_device;

diff --git a/src/main.c b/src/main.c
@@ -20,8 +20,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/pathfile.c b/src/pathfile.c
@@ -18,8 +18,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #ifdef HAVE_STRINGS_H

diff --git a/src/score.c b/src/score.c
@@ -19,8 +19,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 

diff --git a/src/title.c b/src/title.c
@@ -19,8 +19,6 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>