--- a/quickSelfTest/Make.proto Wed Oct 18 11:31:04 2017 +0200
+++ b/quickSelfTest/Make.proto Wed Oct 18 11:31:06 2017 +0200
@@ -23,7 +23,7 @@
NOAUTOLOAD=1
NOSUBAUTOLOAD=1
-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
+LOCALINCLUDES= -I$(INCLUDE_TOP)/exept/libcrypt -I$(INCLUDE_TOP)/stx/goodies/regex -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,6 +60,7 @@
#
REQUIRED_LIBS= libstx_libbasic \
+ libstx_goodies_regex \
libstx_libbasic2 \
libstx_libcomp \
libstx_goodies_authentication \
@@ -86,6 +87,7 @@
REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
+ ../../regex/libstx_goodies_regex$(O_EXT) \
../../../libbasic2/libstx_libbasic2$(O_EXT) \
../../../libcomp/libstx_libcomp$(O_EXT) \
../../authentication/libstx_goodies_authentication$(O_EXT) \
@@ -112,6 +114,7 @@
REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libstx_goodies_regex$(O_EXT) \
libstx_libbasic2$(O_EXT) \
libstx_libcomp$(O_EXT) \
libstx_goodies_authentication$(O_EXT) \
@@ -262,6 +265,19 @@
../../../libbasic/makefile: ../../../libbasic/Make.proto
$(TOP)/rules/stmkmf --cd ../../../libbasic
+libstx_goodies_regex.so: ../../regex/libstx_goodies_regex.so
+ ln -sf ../../regex/libstx_goodies_regex.so .
+
+../../regex/libstx_goodies_regex.so: ../../regex/makefile $(FORCE)
+ @if [ -f "../../regex/.NOSOURCE" ]; then \
+ echo "skip make in ../../regex (no source)"; \
+ else \
+ cd ../../regex && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+../../regex/makefile: ../../regex/Make.proto
+ $(TOP)/rules/stmkmf --cd ../../regex
+
libstx_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
ln -sf ../../../libbasic2/libstx_libbasic2.so .