[vlc-commits] src: fix fourcc_gen build on OS/2

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun <komh at chollian.net> | Wed Jul  8 15:56:04 2015 +0900| [909695702f41c837ee39cab5583a888413cecc8c] | committer: Rémi Denis-Courmont

src: fix fourcc_gen build on OS/2

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=909695702f41c837ee39cab5583a888413cecc8c
---

 configure.ac                    |    4 ++++
 extras/package/os2/configure.sh |    3 ++-
 src/Makefile.am                 |    6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7fd0bea..83a6ad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -299,9 +299,13 @@ case "${build_os}" in
     cygwin|msys)
         ac_executable_extensions=".exe"
     ;;
+    os2*)
+        BUILDEXEEXT=".exe"
+    ;;
     *)
     ;;
 esac
+AC_SUBST(BUILDEXEEXT)
 
 dnl Android is linux, but a bit different
 AS_IF([test "$SYS" = linux],[
diff --git a/extras/package/os2/configure.sh b/extras/package/os2/configure.sh
index dc954ea..235d7c1 100644
--- a/extras/package/os2/configure.sh
+++ b/extras/package/os2/configure.sh
@@ -44,5 +44,6 @@ OPTIONS="
 export ARCHFLAGS=${ARCHFLAGS-"-march=i486"}
 export CFLAGS="${CFLAGS} ${ARCHFLAGS}"
 export CXXFLAGS="${CXXFLAGS} ${ARCHFLAGS}"
+export BUILDCC="gcc -std=c99"
 
-sh "$(dirname $0)"/../../../configure ${OPTIONS} $*
+sh "$(dirname $0)"/../../../configure ${OPTIONS} "$@"
diff --git a/src/Makefile.am b/src/Makefile.am
index acebc34..61c65ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -512,13 +512,13 @@ SOURCES_libvlc = \
 # FourCC tables
 BUILT_SOURCES += fourcc_tables.h
 EXTRA_DIST += misc/fourcc_gen.c
-MOSTLYCLEANFILES = fourcc_gen
+MOSTLYCLEANFILES = fourcc_gen$(BUILDEXEEXT)
 
-fourcc_gen: misc/fourcc_gen.c misc/fourcc_list.h ../include/vlc_fourcc.h
+fourcc_gen$(BUILDEXEEXT): misc/fourcc_gen.c misc/fourcc_list.h ../include/vlc_fourcc.h
 	$(AM_V_at)rm -f -- $@
 	$(AM_V_CC)$(BUILDCC) -I$(srcdir) -o $@ $<
 
-fourcc_tables.h: fourcc_gen
+fourcc_tables.h: fourcc_gen$(BUILDEXEEXT)
 	$(AM_V_at)rm -f -- $@.tmp
 	$(AM_V_GEN)$(builddir)/fourcc_gen > $@.tmp
 	$(AM_V_at)mv -f -- $@.tmp $@