From: Marco van Wieringen <mvw@planets.elm.net>
Date: Wed, 3 Mar 2010 17:37:37 +0000 (+0100)
Subject: Lets generate ingres code by calling esqlcc and not esqlc as we want c++ code. Replac... 
X-Git-Tag: Release-5.2.1~1650
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f7697a02bcce13c515e544b05418cb18a3dfd73;p=bacula%2Fbacula

Lets generate ingres code by calling esqlcc and not esqlc as we want c++ code. Replaced some strncpy by bstrncpy calls. Add dependency in Makefile of generated code on it source file.
---

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 3840f20ef9..f12ea35950 100644
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -56,10 +56,15 @@ all: Makefile libbacsql$(DEFAULT_ARCHIVE_TYPE)
 	@echo "==== Make of sqllib is good ===="
 	@echo " "
 
-# SRE: embeddedSQL precompiler run
-esql:
-	$(II_SYSTEM)/ingres/bin/esqlc -omyingres.c myingres.sc
-	$(II_SYSTEM)/ingres/bin/esqlc -omyingres.h myingres.sh
+myingres.c: myingres.sc
+	@echo "Generating $@ from $<"
+	$(NO_ECHO)$(II_SYSTEM)/ingres/bin/esqlcc -extension=c $<
+
+myingres.h: myingres.sh
+	@echo "Generating $@ from $<"
+	$(NO_ECHO)$(II_SYSTEM)/ingres/bin/esqlcc -extension=h $<
+
+esql: myingres.c myingres.h
 
 libbacsql.a: $(LIBBACSQL_OBJS)
 	@echo "Making $@ ..."