Changeset 467 for trunk/zoo-project/zoo-kernel/makefile.vc

Timestamp:

Apr 25, 2014, 9:51:59 PM (10 years ago)

Author:

djay

Message:

Various fixes for tickets #93, #94, #95, #95, #96.

File:

• trunk/zoo-project/zoo-kernel/makefile.vc (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/makefile.vc

@@ -8 +8 @@
 !INCLUDE nmake.opt
 
-all:  zoo_loader.cgi
+all:  zoo_loader.cgi zcfg2yaml
 
 version.h:
-        svnversion -q -c -n . > version_0.h
-        set /p VERS=<version_0.h
-        rm version_0.h
-        echo #define ZOO_VERSION "%VERS%" > version.h
+        set VERS=`svnversion .`
+        echo #define ZOO_VERSION "$(VERS)" > version.h
 
 main_conf_read.tab.c: main_conf_read.y service.h
@@ -39 +37 @@
 lex.sr.obj: lex.sr.c service.h
         $(CPP) $(CFLAGS) /c lex.sr.c
+
+zcfg2yaml.obj: zcfg2yaml.c
+        $(CPP) $(CFLAGS) /c zcfg2yaml.c
 
 service_internal.obj: service_internal.c
@@ -70 +71 @@
         $(CPP) /EHsc /c $(CFLAGS) ..\..\thirds\dirent-win32\dirent.c
 
-zoo_loader.cgi: zoo_loader.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
+zoo_loader.cgi: version.h zoo_loader.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
         link zoo_loader.obj dirent.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj  zoo_service_loader.obj /out:zoo_loader.cgi $(LDFLAGS) $(LDFLAGSCGI)
+
+zcfg2yaml.exe: version.h zcfg2yaml.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
+        link zcfg2yaml.obj dirent.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj /out:zcfg2yaml.exe $(LDFLAGS) $(LDFLAGSCGI)
 
 clean: