Merge pull request #233 from Dragon-Baroque/exult_clean_compile_flags

Align compilation flags of Linux / MacOS builds to Windows builds

Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/headers -I$(srcdir)/imagewin -I$(srcdir)/s
 	-I$(srcdir)/audio -I$(srcdir)/audio/midi_drivers -I$(srcdir)/pathfinder \
 	-I$(srcdir)/usecode -I$(srcdir)/shapes/shapeinf \
 	$(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \
-	$(DEBUG_FLAGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
+	$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
 
 if BUILD_MODS
 MODSDIR=content

android/lib/src/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(srcdir)/../include -I$(top_srcdir) -I$(top_srcdir)/headers -I$(top_srcdir)/conf $(SDL_CFLAGS) $(INCDIRS)	\
-		$(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+		$(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libandroid.la
 

audio/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/imagewin -
 		-I$(top_srcdir)/objs -I$(top_srcdir)/files -I$(top_srcdir)/gumps \
 		-I$(top_srcdir)/conf -I$(top_srcdir)/audio/midi_drivers \
 		$(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) \
-		$(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+		$(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 SUBDIRS = midi_drivers
 

audio/midi_drivers/Makefile.am

@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)/conf -I$(top_srcdir) \
 		-I$(top_srcdir)/objs -I$(top_srcdir)/shapes \
 		$(SDL_CFLAGS) $(MT32EMU_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \
 		$(MT32EMUFLAGS) \
-		$(DEBUG_FLAGS) $(CPPFLAGS)
+		$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 SUBDIRS = timidity
 

audio/midi_drivers/timidity/Makefile.am

@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)/conf \
 			-I$(top_srcdir)/files -I$(top_srcdir)/imagewin \
 			-I$(top_srcdir)/shapes \
 			$(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \
-			$(DEBUG_FLAGS) $(CPPFLAGS)
+			$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libtimidity.la
 

conf/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/headers -I$(top_srcdir)/files $(SDL_CFLAGS) $(INCDIRS) \
-		 $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS) $(WARNINGS)
+		 $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 if BUILD_TOOLS
 noinst_PROGRAMS = confregress

configure.ac

@@ -408,13 +408,13 @@ AC_CHECK_HEADER(fluidsynth.h, HAVEFLUIDSYNTH=yes, HAVEFLUIDSYNTH=no)
 AC_ARG_ENABLE(fluidsynth, AS_HELP_STRING([--disable-fluidsynth], [Disable fluidsynth midi support]),,enable_fluidsynth=yes)
 AC_MSG_CHECKING([if we want to use fluidsynth midi])
 if test x$HAVEFLUIDSYNTH = xyes; then
-		if test x$enable_fluidsynth = xyes; then
-				AC_MSG_RESULT(yes)
-				AC_DEFINE(USE_FLUIDSYNTH_MIDI, 1, [Enable fluidsynth midi])
-				FLUIDSYNTH_LIBS="-lfluidsynth"
-		else
-				AC_MSG_RESULT(no)
-		fi
+	if test x$enable_fluidsynth = xyes; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(USE_FLUIDSYNTH_MIDI, 1, [Enable fluidsynth midi])
+		FLUIDSYNTH_LIBS="-lfluidsynth"
+	else
+		AC_MSG_RESULT(no)
+	fi
 else
 		AC_MSG_RESULT([no; fluidsynth.h not found])
 fi
@@ -642,42 +642,42 @@ else
 
 	if test x$opt_level = xnone; then
 		AC_MSG_RESULT(none)
-		DEBUG_FLAGS="$DEBUG_FLAGS -O0"
+		OPT_LEVEL="$OPT_LEVEL -O0"
 	elif test x$opt_level = xsize; then
 		AC_MSG_RESULT(size)
-		AX_CHECK_COMPILE_FLAG([-Os], [have_os_opt=yes], [have_os_opt=no], [$DEBUG_FLAGS -Werror])
+		AX_CHECK_COMPILE_FLAG([-Os], [have_os_opt=yes], [have_os_opt=no], [$OPT_LEVEL -Werror])
 		if test x$have_os_opt = xyes; then
-			DEBUG_FLAGS="$DEBUG_FLAGS -Os"
+			OPT_LEVEL="$OPT_LEVEL -Os"
 		else
 			# Sane default if compiler does not support -Os
-			DEBUG_FLAGS="$DEBUG_FLAGS -O2"
+			OPT_LEVEL="$OPT_LEVEL -O2"
 			for opt_flag in -falign-functions -falign-jumps -falign-loops -falign-labels -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays -ftree-vect-loop-version
 			do
-				AX_CHECK_COMPILE_FLAG([$opt_flag], [DEBUG_FLAGS="$DEBUG_FLAGS $opt_flag"], [], [$DEBUG_FLAGS -Werror])
+				AX_CHECK_COMPILE_FLAG([$opt_flag], [OPT_LEVEL="$OPT_LEVEL $opt_flag"], [], [$OPT_LEVEL -Werror])
 			done
 		fi
 	elif test x$opt_level = xdebug; then
 		AC_MSG_RESULT(debug)
-		AX_CHECK_COMPILE_FLAG([-Og], [have_og_opt=yes], [have_og_opt=no], [$DEBUG_FLAGS -Werror])
+		AX_CHECK_COMPILE_FLAG([-Og], [have_og_opt=yes], [have_og_opt=no], [$OPT_LEVEL -Werror])
 		if test x$have_og_opt = xyes; then
-			DEBUG_FLAGS="$DEBUG_FLAGS -Og"
+			OPT_LEVEL="$OPT_LEVEL -Og"
 		else
 			# Sane default if compiler does not support -Og
-			DEBUG_FLAGS="$DEBUG_FLAGS -O1"
+			OPT_LEVEL="$OPT_LEVEL -O1"
 			for opt_flag in -fno-branch-count-reg -fno-if-conversion -fno-if-conversion2 -fno-inline-functions-called-once -fno-move-loop-invariants -fno-ssa-phiopt -fno-tree-bit-ccp -fno-tree-pta -fno-tree-sra
 			do
-				AX_CHECK_COMPILE_FLAG([$opt_flag], [DEBUG_FLAGS="$DEBUG_FLAGS $opt_flag"], [], [$DEBUG_FLAGS -Werror])
+				AX_CHECK_COMPILE_FLAG([$opt_flag], [OPT_LEVEL="$OPT_LEVEL $opt_flag"], [], [$OPT_LEVEL -Werror])
 			done
 		fi
 	elif test x$opt_level = xlight; then
 		AC_MSG_RESULT(light)
-		DEBUG_FLAGS="$DEBUG_FLAGS -O1"
+		OPT_LEVEL="$OPT_LEVEL -O1"
 	elif test x$opt_level = xnormal; then
 		AC_MSG_RESULT(normal)
-		DEBUG_FLAGS="$DEBUG_FLAGS -O2"
+		OPT_LEVEL="$OPT_LEVEL -O2"
 	elif test x$opt_level = xheavy; then
 		AC_MSG_RESULT(heavy)
-		DEBUG_FLAGS="$DEBUG_FLAGS -O3"
+		OPT_LEVEL="$OPT_LEVEL -O3"
 	else
 		AC_MSG_RESULT(invalid)
 		echo "Invalid option given for --with-optimization: $opt_level."
@@ -688,7 +688,7 @@ fi
 
 # link-time optimization
 GB_ENABLE_LTO
-DEBUG_FLAGS="$DEBUG_FLAGS $LTO_CFLAGS"
+DEBUG_LEVEL="$DEBUG_LEVEL $LTO_CFLAGS"
 
 
 # ---------------------------------------------------------------------
@@ -731,9 +731,9 @@ else
 			AC_DEFINE(DEBUG, 1, [Enable debug mode])
 		fi
 		if test x$dbg_level = xextreme; then
-			DEBUG_FLAGS="$DEBUG_FLAGS -g3"
+			DEBUG_LEVEL="$DEBUG_LEVEL -g3"
 		else
-			DEBUG_FLAGS="$DEBUG_FLAGS -g"
+			DEBUG_LEVEL="$DEBUG_LEVEL -g"
 		fi
 		# TODO: Maybe add warning that -O0 and -Og work better for debug symbols?
 	else
@@ -831,11 +831,9 @@ fi
 WARNINGS=""
 for cxx_flag in $CHK_WARN
 do
-	AX_CHECK_COMPILE_FLAG([$cxx_flag], [WARNINGS="$WARNINGS $cxx_flag"], [], [$DEBUG_FLAGS -Werror])
+	AX_CHECK_COMPILE_FLAG([$cxx_flag], [WARNINGS="$WARNINGS $cxx_flag"], [], [$DEBUG_LEVEL -Werror])
 done
 
-DEBUG_FLAGS="$DEBUG_FLAGS $WARNINGS"
-
 
 # --------------------
 # External features
@@ -1153,13 +1151,14 @@ AC_SUBST(EXE_TARGET)
 AC_SUBST(EXULT_DATADIR)
 AC_SUBST(SYSLIBS)
 AC_SUBST(ICON_FILE)
-AC_SUBST(DEBUG_FLAGS)
+AC_SUBST(DEBUG_LEVEL)
+AC_SUBST(OPT_LEVEL)
+AC_SUBST(WARNINGS)
 AC_SUBST(ZLIB_LIBS)
 AC_SUBST(MT32EMU_LIBS)
 AC_SUBST(MT32EMU_CFLAGS)
 AC_SUBST(FLUIDSYNTH_LIBS)
 AC_SUBST(ALSA_LIBS)
-AC_SUBST(WARNINGS)
 AC_SUBST(AR_FLAGS)
 
 AC_CONFIG_FILES([

files/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/headers $(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \
-		$(DEBUG_FLAGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
+		$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
 
 SUBDIRS = sha1 zip
 

files/sha1/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(DEBUG_FLAGS) $(CPPFLAGS)
+AM_CPPFLAGS = $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libsha1.la
 

files/zip/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = $(SDL_CFLAGS) $(INCDIRS) -I$(top_srcdir)/headers $(WINDOWING_SYSTEM) \
-		$(DEBUG_FLAGS) $(CPPFLAGS)
+		$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libminizip.la
 

flic/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/imagewin -I$(top_srcdir)/files \
 		-I$(top_srcdir)/objs -I$(top_srcdir)/shapes\
-	 $(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+	 $(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libflic.la
 

gamemgr/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/headers -I$(top_srcdir)/files	\
 		-I$(top_srcdir)/shapes -I$(top_srcdir)/audio -I$(top_srcdir)/audio/midi_drivers	\
 		-I$(top_srcdir)/conf -I$(top_srcdir)/objs -I$(top_srcdir)/imagewin	\
 		-I$(top_srcdir)/gumps $(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(INCDIRS) \
-		$(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS) \
+		$(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) \
 		-DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
 
 noinst_LTLIBRARIES = libgamemgr.la

gumps/Makefile.am

@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/files \
 		-I$(top_srcdir)/conf -I$(top_srcdir)/usecode -I$(top_srcdir)/data \
 		-I$(top_srcdir)/shapes/shapeinf \
 		$(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(INCDIRS)	\
-		$(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+		$(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libgumps.la
 

imagewin/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/files $(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \
 		-I$(top_srcdir)/conf \
-		$(DEBUG_FLAGS) $(CPPFLAGS)
+		$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libimagewin.la
 

mapedit/Makefile.am

@@ -2,7 +2,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/shapes \
 	-I$(top_srcdir)/imagewin -I$(top_srcdir)/conf -I$(top_srcdir)/gamemgr \
 	-I$(top_srcdir)/files -I$(top_srcdir)/server  -I$(top_srcdir)/usecode \
 	-I$(top_srcdir)/shapes/shapeinf \
-	$(GTK_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
+	$(GTK_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \
+	$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
 
 if GIMP_PLUGIN
 GIMP_PLUGINS=u7shp
@@ -20,7 +21,8 @@ u7shp_SOURCES = u7shp.cc
 
 u7shp_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/files -I$(top_srcdir)/headers \
 	-I$(top_srcdir)/shapes -I$(top_srcdir)/imagewin -I$(top_srcdir)/files \
-	$(GIMP_INCLUDES) $(GTK_CFLAGS) $(INCDIRS) $(DEBUG_FLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H
+	$(GIMP_INCLUDES) $(GTK_CFLAGS) $(INCDIRS) \
+	$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) -DHAVE_CONFIG_H
 
 u7shp_LDADD = \
 	../imagewin/libimagewin.la	\

objs/Makefile.am

@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/imagewin -
 		-I$(top_srcdir)/server -I$(top_srcdir)/gumps -I$(top_srcdir)/shapes/shapeinf \
 		-I$(top_srcdir)/audio -I$(top_srcdir)/audio/midi_drivers -I$(top_srcdir)/usecode \
 		$(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) \
-		$(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+		$(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libobjs.la
 

pathfinder/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/headers -I$(top_srcdir)/objs $(SDL_CFLAGS) $(INCDIRS) \
-		$(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+		$(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libpathfinder.la
 

server/Makefile.am

@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/files \
 	-I$(top_srcdir)/objs -I$(top_srcdir)/imagewin -I$(top_srcdir)/shapes \
 	-I$(top_srcdir)/usecode -I$(top_srcdir)/gumps \
-	$(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+	$(SDL_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libserver.la
 

shapes/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/files \
 	-I$(top_srcdir)/imagewin -I$(top_srcdir)/audio -I$(top_srcdir)/shapes/shapeinf \
 	-I$(top_srcdir)/data -I$(top_srcdir)/usecode -I$(top_srcdir)/objs \
 	$(SDL_CFLAGS) $(FREETYPE2_INCLUDES) \
-	$(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+	$(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 SUBDIRS = shapeinf
 

shapes/shapeinf/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/files \
-	-I$(top_srcdir)/shapes $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+	-I$(top_srcdir)/shapes $(INCDIRS) $(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libshapeinf.la
 

tools/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)/files -I$(top_srcdir)/usecode \
 	-I$(top_srcdir) -I$(top_srcdir)/shapes -I$(top_srcdir)/imagewin \
-	-I$(top_srcdir)/conf $(DEBUG_FLAGS) $(CPPFLAGS) $(SDL_CFLAGS) \
+	-I$(top_srcdir)/conf $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) $(SDL_CFLAGS) \
 	$(GDK_PIXBUF_CFLAGS)
 
 if HAVE_PNG

usecode/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir) -I$(top_srcdir)/files -I$(
 		-I$(top_srcdir)/shapes -I$(top_srcdir)/objs -I$(top_srcdir)/audio -I$(top_srcdir)/audio/midi_drivers \
 		-I$(top_srcdir)/gumps -I$(top_srcdir)/tools -I$(top_srcdir)/shapes/shapeinf \
 		-I$(top_srcdir)/server $(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(INCDIRS) \
-		$(WINDOWING_SYSTEM) $(DEBUG_FLAGS) $(CPPFLAGS)
+		$(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 SUBDIRS = . compiler ucxt
 

usecode/compiler/Makefile.am

@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)/usecode -I$(top_srcdir)/files -I$(top_srcdir) \
-	$(INCDIRS) $(DEBUG_FLAGS) $(CPPFLAGS)
+	$(INCDIRS) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 AM_YFLAGS = -d -v				# Want ucparse.h.
 

usecode/ucxt/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)/usecode/ucxt/include -I$(top_srcdir)/conf -I$(top_srcdir) \
-        -I$(top_srcdir)/usecode $(INCDIRS) $(DEBUG_FLAGS) \
-        $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\" $(WARNINGS)
+        -I$(top_srcdir)/usecode $(INCDIRS) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) \
+        $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
 
 if BUILD_TOOLS
 SUBDIRS = . src include data Docs

usecode/ucxt/src/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)/usecode/ucxt/include -I$(top_srcdir)/conf \
-	-I$(top_srcdir)/usecode -I$(top_srcdir) $(INCDIRS) $(DEBUG_FLAGS) $(CPPFLAGS) \
-	-DEXULT_DATADIR=\"$(EXULT_DATADIR)\" $(WARNINGS)
+	-I$(top_srcdir)/usecode -I$(top_srcdir) $(INCDIRS) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) \
+	-DEXULT_DATADIR=\"$(EXULT_DATADIR)\"
 
 ucxt_SOURCES = \
 	ops.cc \