Separate compiler from pre-processor options

Clean-up what goes in AM_CFLAGS and AM_CPPFLAGS
Use more descriptive names such that comments are not needed.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

configure.ac

@@ -58,7 +58,8 @@ AC_ARG_ENABLE(geodegx-panel,
 	      AC_HELP_STRING([--disable-geodegx-panel],
 	      	             [Disable support for flatpanels with the Geode GX]),
 	      [ ], 
-	      [ AMD_CFLAGS="-DPNL_SUP $AMD_CFLAGS" ])
+	      [ PANEL_CPPFLAGS=-DPNL_SUP ])
+AC_SUBST(PANEL_CPPFLAGS)
 
 # Define a configure option to enable/disable ztv
 AC_ARG_ENABLE(ztv,
@@ -136,7 +137,6 @@ fi
 
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
-AC_SUBST([AMD_CFLAGS])
 
 DRIVER_NAME=geode
 AC_SUBST([DRIVER_NAME])

src/Makefile.am

@@ -27,19 +27,14 @@
 AM_CPPFLAGS = 				\
 	-I$(top_srcdir)/src/cim 	\
 	-I$(top_srcdir)/src/gfx 	\
-	-I$(top_srcdir)/src/panel
-
-# -DPNL_SUP is now provided by AMD_CFLAGS
-#
-AM_CFLAGS = 		\
-	$(XORG_CFLAGS)	\
-	$(CWARNFLAGS)	\
-	$(AMD_CFLAGS)	\
-	$(M32_CFLAGS)	\
-	-DHAVE_GX	\
-	-DHAVE_LX	\
+	-I$(top_srcdir)/src/panel	\
+	$(PANEL_CPPFLAGS)		\
+	-DHAVE_GX			\
+	-DHAVE_LX			\
 	-DOPT_ACCEL
 
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(M32_CFLAGS)
+
 geode_drv_la_LTLIBRARIES = geode_drv.la
 geode_drv_la_LDFLAGS = -module -avoid-version
 geode_drv_ladir = @moduledir@/drivers