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.
removed ole for linux
authorsr
Fri, 13 Oct 2017 16:34:00 +0200
changeset 487 63f2962fdb2f
parent 486 b88f5625e538
child 488 77e63fa48580
removed ole for linux
quickSelfTest/Make.proto file | annotate | diff | comparison | revisions 
--- a/quickSelfTest/Make.proto	Fri Oct 13 16:33:58 2017 +0200
+++ b/quickSelfTest/Make.proto	Fri Oct 13 16:34:00 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/goodies/webServer/htmlTree -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)/exept/libcrypt -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,9 +60,9 @@
 #
 
 REQUIRED_LIBS= libstx_libbasic \
- libstx_goodies_webServer_htmlTree \
  libstx_libbasic2 \
  libstx_libcomp \
+ libstx_goodies_authentication \
  libstx_goodies_refactoryBrowser_parser \
  libstx_libbasic3 \
  libstx_libview \
@@ -73,7 +73,6 @@
  libstx_libview2 \
  libstx_goodies_sunit \
  libstx_libwidg \
- libexept_ole \
  libstx_libhtml \
  libstx_libwidg2 \
  libstx_libcompat \
@@ -82,12 +81,14 @@
  libstx_libjavascript \
  libstx_goodies_xml_stx \
  libstx_goodies_regression \
+ libstx_goodies_webServer \
+ libstx_goodies_webServer_htmlTree \
 
 
 REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
- ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree$(O_EXT) \
  ../../../libbasic2/libstx_libbasic2$(O_EXT) \
  ../../../libcomp/libstx_libcomp$(O_EXT) \
+ ../../authentication/libstx_goodies_authentication$(O_EXT) \
  ../../refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \
  ../../../libbasic3/libstx_libbasic3$(O_EXT) \
  ../../../libview/libstx_libview$(O_EXT) \
@@ -98,7 +99,6 @@
  ../../../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) \
@@ -107,12 +107,14 @@
  ../../../libjavascript/libstx_libjavascript$(O_EXT) \
  ../../xml/stx/libstx_goodies_xml_stx$(O_EXT) \
  ../../regression/libstx_goodies_regression$(O_EXT) \
+ ../../webServer/libstx_goodies_webServer$(O_EXT) \
+ ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree$(O_EXT) \
 
 
 REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
- libstx_goodies_webServer_htmlTree$(O_EXT) \
  libstx_libbasic2$(O_EXT) \
  libstx_libcomp$(O_EXT) \
+ libstx_goodies_authentication$(O_EXT) \
  libstx_goodies_refactoryBrowser_parser$(O_EXT) \
  libstx_libbasic3$(O_EXT) \
  libstx_libview$(O_EXT) \
@@ -123,7 +125,6 @@
  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) \
@@ -132,6 +133,8 @@
  libstx_libjavascript$(O_EXT) \
  libstx_goodies_xml_stx$(O_EXT) \
  libstx_goodies_regression$(O_EXT) \
+ libstx_goodies_webServer$(O_EXT) \
+ libstx_goodies_webServer_htmlTree$(O_EXT) \
 
 
 REQUIRED_SUPPORT_DIRS=RESOURCEFILES
@@ -259,19 +262,6 @@
 ../../../libbasic/makefile: ../../../libbasic/Make.proto
 	$(TOP)/rules/stmkmf --cd ../../../libbasic
 
-libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so
-	ln -sf ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so .
-
-../../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 ../../webServer/htmlTree && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-../../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 .
 
@@ -298,6 +288,19 @@
 ../../../libcomp/makefile: ../../../libcomp/Make.proto
 	$(TOP)/rules/stmkmf --cd ../../../libcomp
 
+libstx_goodies_authentication.so: ../../authentication/libstx_goodies_authentication.so
+	ln -sf ../../authentication/libstx_goodies_authentication.so .
+
+../../authentication/libstx_goodies_authentication.so: ../../authentication/makefile $(FORCE)
+	@if [ -f "../../authentication/.NOSOURCE" ]; then \
+	    echo "skip make in ../../authentication (no source)"; \
+	else \
+	    cd ../../authentication && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+../../authentication/makefile: ../../authentication/Make.proto
+	$(TOP)/rules/stmkmf --cd ../../authentication
+
 libstx_goodies_refactoryBrowser_parser.so: ../../refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so
 	ln -sf ../../refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so .
 
@@ -428,19 +431,6 @@
 ../../../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 .
 
@@ -545,6 +535,32 @@
 ../../regression/makefile: ../../regression/Make.proto
 	$(TOP)/rules/stmkmf --cd ../../regression
 
+libstx_goodies_webServer.so: ../../webServer/libstx_goodies_webServer.so
+	ln -sf ../../webServer/libstx_goodies_webServer.so .
+
+../../webServer/libstx_goodies_webServer.so: ../../webServer/makefile $(FORCE)
+	@if [ -f "../../webServer/.NOSOURCE" ]; then \
+	    echo "skip make in ../../webServer (no source)"; \
+	else \
+	    cd ../../webServer && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+../../webServer/makefile: ../../webServer/Make.proto
+	$(TOP)/rules/stmkmf --cd ../../webServer
+
+libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so
+	ln -sf ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so .
+
+../../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 ../../webServer/htmlTree && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+../../webServer/htmlTree/makefile: ../../webServer/htmlTree/Make.proto
+	$(TOP)/rules/stmkmf --cd ../../webServer/htmlTree
+
hg/stx-goodies-builder