diff -r 17a2d1d9f205 -r ee807ff2f897 compiler/cli/Make.proto --- a/compiler/cli/Make.proto Fri Sep 25 03:51:15 2015 +0100 +++ b/compiler/cli/Make.proto Fri Sep 25 21:58:10 2015 +0100 @@ -60,12 +60,33 @@ # REQUIRED_LIBS= libstx_libbasic \ + libjv_llvm_s \ + libstx_libbasic2 \ + libstx_libcomp \ + libstx_goodies_refactoryBrowser_parser \ + libstx_libbasic3 \ + libstx_goodies_ring \ + libjv_tea_compiler \ REQUIRED_LIBOBJS= $(TOP)/libbasic/libstx_libbasic$(O_EXT) \ + ../../../llvm_s/libjv_llvm_s$(O_EXT) \ + $(TOP)/libbasic2/libstx_libbasic2$(O_EXT) \ + $(TOP)/libcomp/libstx_libcomp$(O_EXT) \ + $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \ + $(TOP)/libbasic3/libstx_libbasic3$(O_EXT) \ + $(TOP)/goodies/ring/libstx_goodies_ring$(O_EXT) \ + ..//libjv_tea_compiler$(O_EXT) \ REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \ + libjv_llvm_s$(O_EXT) \ + libstx_libbasic2$(O_EXT) \ + libstx_libcomp$(O_EXT) \ + libstx_goodies_refactoryBrowser_parser$(O_EXT) \ + libstx_libbasic3$(O_EXT) \ + libstx_goodies_ring$(O_EXT) \ + libjv_tea_compiler$(O_EXT) \ REQUIRED_SUPPORT_DIRS=RESOURCEFILES @@ -193,6 +214,97 @@ $(TOP)/libbasic/makefile: $(TOP)/libbasic/Make.proto $(TOP)/rules/stmkmf --cd $(TOP)/libbasic +libjv_llvm_s.so: ../../../llvm_s/libjv_llvm_s.so + ln -sf ../../../llvm_s/libjv_llvm_s.so . + +../../../llvm_s/libjv_llvm_s.so: ../../../llvm_s/makefile $(FORCE) + @if [ -f "../../../llvm_s/.NOSOURCE" ]; then \ + echo "skip make in ../../../llvm_s (no source)"; \ + else \ + cd ../../../llvm_s && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +../../../llvm_s/makefile: ../../../llvm_s/Make.proto + $(TOP)/rules/stmkmf --cd ../../../llvm_s + +libstx_libbasic2.so: $(TOP)/libbasic2/libstx_libbasic2.so + ln -sf $(TOP)/libbasic2/libstx_libbasic2.so . + +$(TOP)/libbasic2/libstx_libbasic2.so: $(TOP)/libbasic2/makefile $(FORCE) + @if [ -f "$(TOP)/libbasic2/.NOSOURCE" ]; then \ + echo "skip make in $(TOP)/libbasic2 (no source)"; \ + else \ + cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +$(TOP)/libbasic2/makefile: $(TOP)/libbasic2/Make.proto + $(TOP)/rules/stmkmf --cd $(TOP)/libbasic2 + +libstx_libcomp.so: $(TOP)/libcomp/libstx_libcomp.so + ln -sf $(TOP)/libcomp/libstx_libcomp.so . + +$(TOP)/libcomp/libstx_libcomp.so: $(TOP)/libcomp/makefile $(FORCE) + @if [ -f "$(TOP)/libcomp/.NOSOURCE" ]; then \ + echo "skip make in $(TOP)/libcomp (no source)"; \ + else \ + cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +$(TOP)/libcomp/makefile: $(TOP)/libcomp/Make.proto + $(TOP)/rules/stmkmf --cd $(TOP)/libcomp + +libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so + ln -sf $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so . + +$(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/makefile $(FORCE) + @if [ -f "$(TOP)/goodies/refactoryBrowser/parser/.NOSOURCE" ]; then \ + echo "skip make in $(TOP)/goodies/refactoryBrowser/parser (no source)"; \ + else \ + cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +$(TOP)/goodies/refactoryBrowser/parser/makefile: $(TOP)/goodies/refactoryBrowser/parser/Make.proto + $(TOP)/rules/stmkmf --cd $(TOP)/goodies/refactoryBrowser/parser + +libstx_libbasic3.so: $(TOP)/libbasic3/libstx_libbasic3.so + ln -sf $(TOP)/libbasic3/libstx_libbasic3.so . + +$(TOP)/libbasic3/libstx_libbasic3.so: $(TOP)/libbasic3/makefile $(FORCE) + @if [ -f "$(TOP)/libbasic3/.NOSOURCE" ]; then \ + echo "skip make in $(TOP)/libbasic3 (no source)"; \ + else \ + cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +$(TOP)/libbasic3/makefile: $(TOP)/libbasic3/Make.proto + $(TOP)/rules/stmkmf --cd $(TOP)/libbasic3 + +libstx_goodies_ring.so: $(TOP)/goodies/ring/libstx_goodies_ring.so + ln -sf $(TOP)/goodies/ring/libstx_goodies_ring.so . + +$(TOP)/goodies/ring/libstx_goodies_ring.so: $(TOP)/goodies/ring/makefile $(FORCE) + @if [ -f "$(TOP)/goodies/ring/.NOSOURCE" ]; then \ + echo "skip make in $(TOP)/goodies/ring (no source)"; \ + else \ + cd $(TOP)/goodies/ring && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +$(TOP)/goodies/ring/makefile: $(TOP)/goodies/ring/Make.proto + $(TOP)/rules/stmkmf --cd $(TOP)/goodies/ring + +libjv_tea_compiler.so: ..//libjv_tea_compiler.so + ln -sf ..//libjv_tea_compiler.so . + +..//libjv_tea_compiler.so: ..//makefile $(FORCE) + @if [ -f "..//.NOSOURCE" ]; then \ + echo "skip make in ../ (no source)"; \ + else \ + cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +..//makefile: ..//Make.proto + $(TOP)/rules/stmkmf --cd ../ +