--- a/quickSelfTest/Make.proto Fri Oct 13 16:17:03 2017 +0200
+++ b/quickSelfTest/Make.proto Fri Oct 13 16:17:05 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/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/libbasic -I$(INCLUDE_TOP)/stx/libcomp
LOCALDEFINES=
GLOBALDEFINES=
MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
@@ -59,15 +59,17 @@
# required libs:
#
-REQUIRED_LIBS= libexept_libcrypt \
- libstx_libbasic \
+REQUIRED_LIBS= libstx_libbasic \
+ libexept_ole \
libstx_libbasic2 \
libstx_libcomp \
libstx_goodies_refactoryBrowser_parser \
libstx_libbasic3 \
libstx_libview \
+ libexept_osi_asn1 \
libstx_libboss \
libstx_libui \
+ libexept_libcrypt \
libstx_libview2 \
libstx_goodies_sunit \
libstx_libwidg \
@@ -81,15 +83,17 @@
libstx_goodies_regression \
-REQUIRED_LIBOBJS= $(TOP)/../exept/libcrypt/libexept_libcrypt$(O_EXT) \
- ../../../libbasic/libstx_libbasic$(O_EXT) \
+REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
+ $(TOP)/../exept/ole/libexept_ole$(O_EXT) \
../../../libbasic2/libstx_libbasic2$(O_EXT) \
../../../libcomp/libstx_libcomp$(O_EXT) \
../../refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \
../../../libbasic3/libstx_libbasic3$(O_EXT) \
../../../libview/libstx_libview$(O_EXT) \
+ $(TOP)/../exept/osi/asn1/libexept_osi_asn1$(O_EXT) \
../../../libboss/libstx_libboss$(O_EXT) \
../../../libui/libstx_libui$(O_EXT) \
+ $(TOP)/../exept/libcrypt/libexept_libcrypt$(O_EXT) \
../../../libview2/libstx_libview2$(O_EXT) \
../../sunit/libstx_goodies_sunit$(O_EXT) \
../../../libwidg/libstx_libwidg$(O_EXT) \
@@ -103,15 +107,17 @@
../../regression/libstx_goodies_regression$(O_EXT) \
-REQUIRED_LINK_LIBOBJS= libexept_libcrypt$(O_EXT) \
- libstx_libbasic$(O_EXT) \
+REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libexept_ole$(O_EXT) \
libstx_libbasic2$(O_EXT) \
libstx_libcomp$(O_EXT) \
libstx_goodies_refactoryBrowser_parser$(O_EXT) \
libstx_libbasic3$(O_EXT) \
libstx_libview$(O_EXT) \
+ libexept_osi_asn1$(O_EXT) \
libstx_libboss$(O_EXT) \
libstx_libui$(O_EXT) \
+ libexept_libcrypt$(O_EXT) \
libstx_libview2$(O_EXT) \
libstx_goodies_sunit$(O_EXT) \
libstx_libwidg$(O_EXT) \
@@ -237,19 +243,6 @@
-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 .
@@ -263,6 +256,19 @@
../../../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 .
+
+$(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_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
ln -sf ../../../libbasic2/libstx_libbasic2.so .
@@ -328,6 +334,19 @@
../../../libview/makefile: ../../../libview/Make.proto
$(TOP)/rules/stmkmf --cd ../../../libview
+libexept_osi_asn1.so: $(TOP)/../exept/osi/asn1/libexept_osi_asn1.so
+ ln -sf $(TOP)/../exept/osi/asn1/libexept_osi_asn1.so .
+
+$(TOP)/../exept/osi/asn1/libexept_osi_asn1.so: $(TOP)/../exept/osi/asn1/makefile $(FORCE)
+ @if [ -f "$(TOP)/../exept/osi/asn1/.NOSOURCE" ]; then \
+ echo "skip make in $(TOP)/../exept/osi/asn1 (no source)"; \
+ else \
+ cd $(TOP)/../exept/osi/asn1 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+$(TOP)/../exept/osi/asn1/makefile: $(TOP)/../exept/osi/asn1/Make.proto
+ $(TOP)/rules/stmkmf --cd $(TOP)/../exept/osi/asn1
+
libstx_libboss.so: ../../../libboss/libstx_libboss.so
ln -sf ../../../libboss/libstx_libboss.so .
@@ -354,6 +373,19 @@
../../../libui/makefile: ../../../libui/Make.proto
$(TOP)/rules/stmkmf --cd ../../../libui
+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_libview2.so: ../../../libview2/libstx_libview2.so
ln -sf ../../../libview2/libstx_libview2.so .