--- a/quickSelfTest/Make.proto Fri Oct 13 16:13:05 2017 +0200
+++ b/quickSelfTest/Make.proto Fri Oct 13 16:13:07 2017 +0200
@@ -23,7 +23,7 @@
NOAUTOLOAD=1
NOSUBAUTOLOAD=1
-LOCALINCLUDES= -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)/stx/goodies/regression -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
LOCALDEFINES=
GLOBALDEFINES=
MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
@@ -59,7 +59,8 @@
# required libs:
#
-REQUIRED_LIBS= libstx_libbasic \
+REQUIRED_LIBS= libexept_libcrypt \
+ libstx_libbasic \
libstx_libbasic2 \
libstx_libcomp \
libstx_goodies_refactoryBrowser_parser \
@@ -80,7 +81,8 @@
libstx_goodies_regression \
-REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
+REQUIRED_LIBOBJS= $(TOP)/../exept/libcrypt/libexept_libcrypt$(O_EXT) \
+ ../../../libbasic/libstx_libbasic$(O_EXT) \
../../../libbasic2/libstx_libbasic2$(O_EXT) \
../../../libcomp/libstx_libcomp$(O_EXT) \
../../refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \
@@ -101,7 +103,8 @@
../../regression/libstx_goodies_regression$(O_EXT) \
-REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+REQUIRED_LINK_LIBOBJS= libexept_libcrypt$(O_EXT) \
+ libstx_libbasic$(O_EXT) \
libstx_libbasic2$(O_EXT) \
libstx_libcomp$(O_EXT) \
libstx_goodies_refactoryBrowser_parser$(O_EXT) \
@@ -126,7 +129,6 @@
SUBPROJECT_LIBS=
-
target: ALL
all:: prereq ALL_NP
@@ -157,7 +159,7 @@
$(MAKE) FORCE=@@@FORCE-BUILD@@@ $(REQUIRED_LIBOBJS)
subProjects:
-
+
#
# a self installable delivery
@@ -235,6 +237,19 @@
-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
+libexept_libcrypt.so: $(TOP)/../exept/libcrypt/libexept_libcrypt.so
+ ln -sf $(TOP)/../exept/libcrypt/libexept_libcrypt.so .
+
+$(TOP)/../exept/libcrypt/libexept_libcrypt.so: $(TOP)/../exept/libcrypt/makefile $(FORCE)
+ @if [ -f "$(TOP)/../exept/libcrypt/.NOSOURCE" ]; then \
+ echo "skip make in $(TOP)/../exept/libcrypt (no source)"; \
+ else \
+ cd $(TOP)/../exept/libcrypt && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+$(TOP)/../exept/libcrypt/makefile: $(TOP)/../exept/libcrypt/Make.proto
+ $(TOP)/rules/stmkmf --cd $(TOP)/../exept/libcrypt
+
libstx_libbasic.so: ../../../libbasic/libstx_libbasic.so
ln -sf ../../../libbasic/libstx_libbasic.so .