Mercurial Mercurial > hg > stx-goodies-builder / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added references
authorsr
Fri, 13 Oct 2017 16:20:19 +0200
changeset 475 b44fb62e39e2
parent 474 b0ea04c2ed26
child 476 d8ab364c1e8f
added references
quickSelfTest/Make.proto file | annotate | diff | comparison | revisions 
--- a/quickSelfTest/Make.proto	Fri Oct 13 16:20:17 2017 +0200
+++ b/quickSelfTest/Make.proto	Fri Oct 13 16:20:19 2017 +0200
@@ -23,7 +23,7 @@
 NOAUTOLOAD=1
 NOSUBAUTOLOAD=1
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)/exept/libcrypt -I$(INCLUDE_TOP)/exept/ole -I$(INCLUDE_TOP)/stx/goodies/regression -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)/exept/libcrypt -I$(INCLUDE_TOP)/exept/ole -I$(INCLUDE_TOP)/stx/goodies/regression -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/goodies/webServer/htmlTree -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
 LOCALDEFINES=
 GLOBALDEFINES=
 MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
@@ -60,7 +60,7 @@
 #
 
 REQUIRED_LIBS= libstx_libbasic \
- libexept_ole \
+ libstx_goodies_webServer_htmlTree \
  libstx_libbasic2 \
  libstx_libcomp \
  libstx_goodies_refactoryBrowser_parser \
@@ -73,6 +73,7 @@
  libstx_libview2 \
  libstx_goodies_sunit \
  libstx_libwidg \
+ libexept_ole \
  libstx_libhtml \
  libstx_libwidg2 \
  libstx_libcompat \
@@ -84,7 +85,7 @@
 
 
 REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
- $(TOP)/../exept/ole/libexept_ole$(O_EXT) \
+ ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree$(O_EXT) \
  ../../../libbasic2/libstx_libbasic2$(O_EXT) \
  ../../../libcomp/libstx_libcomp$(O_EXT) \
  ../../refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \
@@ -97,6 +98,7 @@
  ../../../libview2/libstx_libview2$(O_EXT) \
  ../../sunit/libstx_goodies_sunit$(O_EXT) \
  ../../../libwidg/libstx_libwidg$(O_EXT) \
+ $(TOP)/../exept/ole/libexept_ole$(O_EXT) \
  ../../../libhtml/libstx_libhtml$(O_EXT) \
  ../../../libwidg2/libstx_libwidg2$(O_EXT) \
  ../../../libcompat/libstx_libcompat$(O_EXT) \
@@ -108,7 +110,7 @@
 
 
 REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
- libexept_ole$(O_EXT) \
+ libstx_goodies_webServer_htmlTree$(O_EXT) \
  libstx_libbasic2$(O_EXT) \
  libstx_libcomp$(O_EXT) \
  libstx_goodies_refactoryBrowser_parser$(O_EXT) \
@@ -121,6 +123,7 @@
  libstx_libview2$(O_EXT) \
  libstx_goodies_sunit$(O_EXT) \
  libstx_libwidg$(O_EXT) \
+ libexept_ole$(O_EXT) \
  libstx_libhtml$(O_EXT) \
  libstx_libwidg2$(O_EXT) \
  libstx_libcompat$(O_EXT) \
@@ -256,18 +259,18 @@
 ../../../libbasic/makefile: ../../../libbasic/Make.proto
 	$(TOP)/rules/stmkmf --cd ../../../libbasic
 
-libexept_ole.so: $(TOP)/../exept/ole/libexept_ole.so
-	ln -sf $(TOP)/../exept/ole/libexept_ole.so .
+libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so
+	ln -sf ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so .
 
-$(TOP)/../exept/ole/libexept_ole.so: $(TOP)/../exept/ole/makefile $(FORCE)
-	@if [ -f "$(TOP)/../exept/ole/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/../exept/ole (no source)"; \
+../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/makefile $(FORCE)
+	@if [ -f "../../webServer/htmlTree/.NOSOURCE" ]; then \
+	    echo "skip make in ../../webServer/htmlTree (no source)"; \
 	else \
-	    cd $(TOP)/../exept/ole && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	    cd ../../webServer/htmlTree && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
 	fi
 
-$(TOP)/../exept/ole/makefile: $(TOP)/../exept/ole/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/../exept/ole
+../../webServer/htmlTree/makefile: ../../webServer/htmlTree/Make.proto
+	$(TOP)/rules/stmkmf --cd ../../webServer/htmlTree
 
 libstx_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
 	ln -sf ../../../libbasic2/libstx_libbasic2.so .
@@ -425,6 +428,19 @@
 ../../../libwidg/makefile: ../../../libwidg/Make.proto
 	$(TOP)/rules/stmkmf --cd ../../../libwidg
 
+libexept_ole.so: $(TOP)/../exept/ole/libexept_ole.so
+	ln -sf $(TOP)/../exept/ole/libexept_ole.so .
+
+$(TOP)/../exept/ole/libexept_ole.so: $(TOP)/../exept/ole/makefile $(FORCE)
+	@if [ -f "$(TOP)/../exept/ole/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/../exept/ole (no source)"; \
+	else \
+	    cd $(TOP)/../exept/ole && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/../exept/ole/makefile: $(TOP)/../exept/ole/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/../exept/ole
+
 libstx_libhtml.so: ../../../libhtml/libstx_libhtml.so
 	ln -sf ../../../libhtml/libstx_libhtml.so .
hg/stx-goodies-builder