3 files changed, 53 insertions, 2 deletions
diff --git a/source4/main.mk b/source4/main.mk
index d3620f0120..2e21e9d715 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -180,7 +180,9 @@ valgrindtest: all
 	./script/tests/selftest.sh ${selftest_prefix}/st quick SOCKET_WRAPPER
 
 .y.c:
-	$(YACC) -d -o $@ $<	
+	@echo "Building $< with $(YACC)"
+	@-$(srcdir)/script/yacc_compile.sh "$(YACC)" "$<" "$@"
 
 .l.c:
-	$(LEX) -o $@ $<
+	@echo "Building $< with $(LEX)"
+	@-$(srcdir)/script/lex_compile.sh "$(LEX)" "$<" "$@"
diff --git a/source4/script/lex_compile.sh b/source4/script/lex_compile.sh
new file mode 100755
index 0000000000..7af9ea1281
--- /dev/null
+++ b/source4/script/lex_compile.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+LEX="$1"
+SRC="$2"
+DEST="$3"
+
+dir=`dirname $SRC`
+file=`basename $SRC`
+base=`basename $SRC .l`
+if [ -z "$LEX" ]; then
+	echo "lex not found - not regenerating $DEST"
+	return;
+fi
+if [ -r $DEST ]; then
+    if [ x`find $SRC -newer $DEST -print` != x$SRC ]; then
+	    return;
+    fi
+fi
+TOP=`pwd`
+if cd $dir && $LEX $file; then
+    sed '/^#/ s|$base.yy\.c|$DEST|' $base.yy.c > $base.c
+    rm -f $base.yy.c
+fi
+cd $TOP
diff --git a/source4/script/yacc_compile.sh b/source4/script/yacc_compile.sh
new file mode 100755
index 0000000000..46a6fb6455
--- /dev/null
+++ b/source4/script/yacc_compile.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+YACC="$1"
+SRC="$2"
+DEST="$3"
+
+dir=`dirname $SRC`
+file=`basename $SRC`
+base=`basename $SRC .y`
+if [ -z "$YACC" ]; then
+	echo "yacc not found"
+	return;
+fi
+if [ -r $DEST ]; then
+	if [ x`find $SRC -newer $DEST -print` != x$SRC ]; then
+	    return;
+    fi
+fi
+TOP=`pwd`
+if cd $dir && $YACC -d $file; then
+	sed -e "/^#/!b" -e "s|y\.tab\.h|$base.h|" y.tab.h > $base.h
+	sed '/^#/ s|y\.tab\.c|$base.c|' y.tab.c > $base.c
+	rm -f y.tab.c y.tab.h
+fi
+cd $TOP