* Add gnu99 compiler directive, make build compatible with earlier automake versions

10 files changed, 51 insertions, 17 deletions

diff --git a/.travis.yml b/.travis.yml
index b3220642..5480c6cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
       - libgtk-3-dev
       - libsdl2-dev
       - libxtst-dev
+      - libxml2-utils
 
 script:
   - ./autogen.sh
diff --git a/configure.ac b/configure.ac
index 4852d8c6..76e62522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([pcsxr], [1.9.95])
 
-AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 AM_INIT_AUTOMAKE(foreign subdir-objects)
@@ -17,6 +17,7 @@ AM_PROG_AS
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
+AX_APPEND_COMPILE_FLAGS([-std=gnu99])
 AX_APPEND_LINK_FLAGS([-fno-pie])
 AX_COMPILER_VENDOR
 if test "$ax_cv_c_compiler_vendor" = "gnu"; then
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 7db62f01..7666dfe7 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -29,7 +29,8 @@ pcsxr_SOURCES = \
 	GtkResources.h
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/gui">
@@ -64,9 +65,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 pcsxr.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 pcsxr_gresource: pcsxr.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/data --generate-dependencies $(srcdir)/$<)
 GtkResources.c: pcsxr.gresource.xml $(pcsxr_gresource)
diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
index 840713b4..0576714f 100644
--- a/plugins/bladesio1/Makefile.am
+++ b/plugins/bladesio1/Makefile.am
@@ -16,7 +16,8 @@ cfgBladeSio1_SOURCES = gui.c sio1.h GtkResources.c GtkResources.h
 cfgBladeSio1_LDADD = $(GTK3_LIBS)
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/bladesio1">
@@ -24,9 +25,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 bladesio1.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 bladesio1_gresource: bladesio1.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<)
 GtkResources.c: bladesio1.gresource.xml $(bladesio1_gresource)
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
index c942fb40..112d7512 100644
--- a/plugins/dfcdrom/Makefile.am
+++ b/plugins/dfcdrom/Makefile.am
@@ -31,7 +31,8 @@ cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c GtkResources.c GtkResources.h
 cfgDFCdrom_LDADD = $(GTK3_LIBS)
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/dfcdrom">
@@ -39,9 +40,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 dfcdrom.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 dfcdrom_gresource: dfcdrom.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-dependencies $(srcdir)/$<)
 GtkResources.c: dfcdrom.gresource.xml $(dfcdrom_gresource)
diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index 458259c5..60a57488 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -17,7 +17,8 @@ cfgDFInput_SOURCES = cfg-gtk.c pad.h GtkResources.c GtkResources.h
 cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL2_LIBS) $(SDL_LIBS) -lX11
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/dfinput">
@@ -25,9 +26,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 dfinput.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 dfinput_gresource: dfinput.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<)
 GtkResources.c: dfinput.gresource.xml $(dfinput_gresource)
diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
index f0a53ea0..d23d9d08 100755
--- a/plugins/dfnet/Makefile.am
+++ b/plugins/dfnet/Makefile.am
@@ -16,7 +16,8 @@ cfgDFNet_SOURCES = gui.c GtkResources.c GtkResources.h
 cfgDFNet_LDADD = $(GTK3_LIBS)
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/dfnet">
@@ -24,9 +25,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 dfnet.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 dfnet_gresource: dfnet.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<)
 GtkResources.c: dfnet.gresource.xml $(dfnet_gresource)
diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 18a49ac7..16c0129d 100755
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -53,7 +53,8 @@ cfgDFSound_SOURCES = spucfg-0.1df/main.c GtkResources.c GtkResources.h
 cfgDFSound_LDADD = $(GTK3_LIBS)
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/dfsound">
@@ -61,9 +62,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 dfsound.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 dfsound_gresource: dfsound.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/spucfg-0.1df --generate-dependencies $(srcdir)/$<)
 GtkResources.c: dfsound.gresource.xml $(dfsound_gresource)
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index b1dc9c3d..15b44b59 100755
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -30,7 +30,8 @@ cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c GtkResources.c GtkResources.h
 cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/dfxvideo">
@@ -38,9 +39,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 dfxvideo.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 dfxvideo_gresource: dfxvideo.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg-0.1df --generate-dependencies $(srcdir)/$<)
 GtkResources.c: dfxvideo.gresource.xml $(dfxvideo_gresource)
diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
index e9d7de4e..e72e8dd5 100755
--- a/plugins/peopsxgl/Makefile.am
+++ b/plugins/peopsxgl/Makefile.am
@@ -30,7 +30,8 @@ cfgpeopsxgl_SOURCES = gpucfg/main.c GtkResources.c GtkResources.h
 cfgpeopsxgl_LDADD = $(GTK3_LIBS)
 
 # gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
+#define gresource_xml =
+define gresource_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/pcsxr/peopsxgl">
@@ -38,9 +39,12 @@ define gresource_xml =
   </gresource>
 </gresources>
 endef
+# FIXME
+export gresource_xml
 
 peopsxgl.gresource.xml:
-	$(file >$@,$(gresource_xml))
+#	$(file >$@,$(gresource_xml))
+	@echo "$$gresource_xml" >$@
 peopsxgl_gresource: peopsxgl.gresource.xml
 	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg --generate-dependencies $(srcdir)/$<)
 GtkResources.c: peopsxgl.gresource.xml $(peopsxgl_gresource)