--- a/application/Make.proto Mon Jul 08 12:37:49 2019 +0100
+++ b/application/Make.proto Mon Jul 08 13:31:11 2019 +0100
@@ -73,11 +73,12 @@
libstx_goodies_magritte \
libstx_libhtml \
libstx_libwidg2 \
+ libstx_libtool \
+ libjv_libgdbs \
+ libstx_goodies_communication \
+ libstx_libtool2 \
libstx_libcompat \
- libstx_libtool \
libstx_goodies_xml_vw \
- libjv_libgdbs \
- libstx_libtool2 \
libjv_vdb \
@@ -95,11 +96,12 @@
$(TOP)/goodies/magritte/libstx_goodies_magritte$(O_EXT) \
$(TOP)/libhtml/libstx_libhtml$(O_EXT) \
$(TOP)/libwidg2/libstx_libwidg2$(O_EXT) \
+ $(TOP)/libtool/libstx_libtool$(O_EXT) \
+ ../../libgdbs/libjv_libgdbs$(O_EXT) \
+ $(TOP)/goodies/communication/libstx_goodies_communication$(O_EXT) \
+ $(TOP)/libtool2/libstx_libtool2$(O_EXT) \
$(TOP)/libcompat/libstx_libcompat$(O_EXT) \
- $(TOP)/libtool/libstx_libtool$(O_EXT) \
$(TOP)/goodies/xml/vw/libstx_goodies_xml_vw$(O_EXT) \
- ../../libgdbs/libjv_libgdbs$(O_EXT) \
- $(TOP)/libtool2/libstx_libtool2$(O_EXT) \
..//libjv_vdb$(O_EXT) \
@@ -117,11 +119,12 @@
libstx_goodies_magritte$(O_EXT) \
libstx_libhtml$(O_EXT) \
libstx_libwidg2$(O_EXT) \
+ libstx_libtool$(O_EXT) \
+ libjv_libgdbs$(O_EXT) \
+ libstx_goodies_communication$(O_EXT) \
+ libstx_libtool2$(O_EXT) \
libstx_libcompat$(O_EXT) \
- libstx_libtool$(O_EXT) \
libstx_goodies_xml_vw$(O_EXT) \
- libjv_libgdbs$(O_EXT) \
- libstx_libtool2$(O_EXT) \
libjv_vdb$(O_EXT) \
@@ -489,19 +492,6 @@
$(TOP)/libwidg2/makefile: $(TOP)/libwidg2/Make.proto
$(TOP)/rules/stmkmf --cd $(TOP)/libwidg2
-libstx_libcompat.so: $(TOP)/libcompat/libstx_libcompat.so
- ln -sf $(TOP)/libcompat/libstx_libcompat.so .
-
-$(TOP)/libcompat/libstx_libcompat.so: $(TOP)/libcompat/makefile $(FORCE)
- @if [ -f "$(TOP)/libcompat/.NOSOURCE" ]; then \
- echo "skip make in $(TOP)/libcompat (no source)"; \
- else \
- cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
- fi
-
-$(TOP)/libcompat/makefile: $(TOP)/libcompat/Make.proto
- $(TOP)/rules/stmkmf --cd $(TOP)/libcompat
-
libstx_libtool.so: $(TOP)/libtool/libstx_libtool.so
ln -sf $(TOP)/libtool/libstx_libtool.so .
@@ -515,19 +505,6 @@
$(TOP)/libtool/makefile: $(TOP)/libtool/Make.proto
$(TOP)/rules/stmkmf --cd $(TOP)/libtool
-libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so
- ln -sf $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so .
-
-$(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/makefile $(FORCE)
- @if [ -f "$(TOP)/goodies/xml/vw/.NOSOURCE" ]; then \
- echo "skip make in $(TOP)/goodies/xml/vw (no source)"; \
- else \
- cd $(TOP)/goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
- fi
-
-$(TOP)/goodies/xml/vw/makefile: $(TOP)/goodies/xml/vw/Make.proto
- $(TOP)/rules/stmkmf --cd $(TOP)/goodies/xml/vw
-
libjv_libgdbs.so: ../../libgdbs/libjv_libgdbs.so
ln -sf ../../libgdbs/libjv_libgdbs.so .
@@ -541,6 +518,19 @@
../../libgdbs/makefile: ../../libgdbs/Make.proto
$(TOP)/rules/stmkmf --cd ../../libgdbs
+libstx_goodies_communication.so: $(TOP)/goodies/communication/libstx_goodies_communication.so
+ ln -sf $(TOP)/goodies/communication/libstx_goodies_communication.so .
+
+$(TOP)/goodies/communication/libstx_goodies_communication.so: $(TOP)/goodies/communication/makefile $(FORCE)
+ @if [ -f "$(TOP)/goodies/communication/.NOSOURCE" ]; then \
+ echo "skip make in $(TOP)/goodies/communication (no source)"; \
+ else \
+ cd $(TOP)/goodies/communication && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+$(TOP)/goodies/communication/makefile: $(TOP)/goodies/communication/Make.proto
+ $(TOP)/rules/stmkmf --cd $(TOP)/goodies/communication
+
libstx_libtool2.so: $(TOP)/libtool2/libstx_libtool2.so
ln -sf $(TOP)/libtool2/libstx_libtool2.so .
@@ -554,6 +544,32 @@
$(TOP)/libtool2/makefile: $(TOP)/libtool2/Make.proto
$(TOP)/rules/stmkmf --cd $(TOP)/libtool2
+libstx_libcompat.so: $(TOP)/libcompat/libstx_libcompat.so
+ ln -sf $(TOP)/libcompat/libstx_libcompat.so .
+
+$(TOP)/libcompat/libstx_libcompat.so: $(TOP)/libcompat/makefile $(FORCE)
+ @if [ -f "$(TOP)/libcompat/.NOSOURCE" ]; then \
+ echo "skip make in $(TOP)/libcompat (no source)"; \
+ else \
+ cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+$(TOP)/libcompat/makefile: $(TOP)/libcompat/Make.proto
+ $(TOP)/rules/stmkmf --cd $(TOP)/libcompat
+
+libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so
+ ln -sf $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so .
+
+$(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/makefile $(FORCE)
+ @if [ -f "$(TOP)/goodies/xml/vw/.NOSOURCE" ]; then \
+ echo "skip make in $(TOP)/goodies/xml/vw (no source)"; \
+ else \
+ cd $(TOP)/goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+$(TOP)/goodies/xml/vw/makefile: $(TOP)/goodies/xml/vw/Make.proto
+ $(TOP)/rules/stmkmf --cd $(TOP)/goodies/xml/vw
+
libjv_vdb.so: ..//libjv_vdb.so
ln -sf ..//libjv_vdb.so .