Fixed Makefile so that we can use c99 CPP

Signed-off-by: Nagao Takeyuki <nagaotakeyuki@gmail.com>

diff --git a/Makefile b/Makefile
index b256b77..840fdac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all:
                js=$${file%.jsh}.js ; \
                output=build/js/$$js; \
                $(PROG_INSTALL) -d build/js && \
-         $(PROG_CPP) -I./src/js/include -P -nostdinc $$bundle \
+         $(PROG_CPP) -I./src/js/include -P -nostdinc -x c -o - $$bundle \
                  | sed -n '/./p' > $$output && \
                echo "Wrote output on $$output" \
                || exit 1 ; \

diff --git a/configure b/configure
index 904c2c5..3acb192 100755 (executable)
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@ CONFIG_FILE=./var/config.mk
 install -d -m 0755 var
 if [ ! -f "$CONFIG_FILE" ] ; then
   cat > "$CONFIG_FILE" <<EOS
-PROG_CPP=cpp
+PROG_CPP=gcc -E
 PROG_INSTALL=install
 EOS
 else

diff --git a/src/js/bundle/jdisp.jsh b/src/js/bundle/jdisp.jsh
index 4ad7ce4..121723b 100644 (file)
--- a/src/js/bundle/jdisp.jsh
+++ b/src/js/bundle/jdisp.jsh
@@ -2,5 +2,6 @@
 #define _JDISP_H
 
 #include <jdisp/package.jsh>
+#include <jdisp/lang/package.jsh>
 
 #endif /* _JDISP_H */