changed build arrangements, added version number, in preparation for productisation

diff --git a/base/Makefile b/base/Makefile
index ad7479c20a4a6749e5fd5c72ae3d706fd96f9758..848210b95cfe768ea0fe1a2a468e69deaa4c6eaf 100644 (file)
--- a/base/Makefile
+++ b/base/Makefile
@@ -1,6 +1,5 @@
 default:       all
 
-SHLIB =                chiark-tcl
 CFILES =       enum hook idtable parse scriptinv tcmdiflib
 BASE_DIR =     .
 
@@ -8,6 +7,8 @@ AUTO_HDRS +=    base+tcmdif.h
 
 include common.make
 
+SHLIB =                $(BASE_SHLIB)
+
 base+tcmdif.h: $(BASE_TCT) $(TCMDIFGEN)
                $(TCMDIFGEN) -wh -o$@ $<
 

diff --git a/base/common.make b/base/common.make
index 1a42772f756252f768a2394fbc2bc41d229a48b8..12259fafc24fd6689f703e6bf076f4785e76e553 100644 (file)
--- a/base/common.make
+++ b/base/common.make
@@ -1,8 +1,12 @@
+VERSION ?=     1
+FAMILY ?=      chiark_tcl
+
 OPTIMISE ?=            -O2
 TCL_MEM_DEBUG ?=       -DTCL_MEM_DEBUG
 
 TCMDIFGEN ?=   $(BASE_DIR)/tcmdifgen
 BASE_TCT ?=    $(BASE_DIR)/base.tct
+BASE_SHLIB ?=  $(FAMILY)-$(VERSION)
 
 ifeq ($(shell $(CC) -Wno-pointer-sign -E -x c /dev/null >/dev/null || echo x),)
 CFLAGS +=      -Wno-pointer-sign

diff --git a/base/extension.make b/base/extension.make
index d12723b4fe079e6a626471545269ed7d2c54a7fd..d03cb286fea34d9d7b8a866e1424f05e320a56ce 100644 (file)
--- a/base/extension.make
+++ b/base/extension.make
@@ -1,18 +1,22 @@
 
-EXTENSION ?=   chiark_tcl_$(EXTBASE)
-SHLIB ?=       $(EXTENSION)
+EXTPREFIX ?=   $(FAMILY)_
+EXTENSION ?=   $(EXTPREFIX)$(EXTBASE)
+SHLIB ?=       $(EXTENSION)-$(VERSION)
 TABLE ?=       $(EXTBASE)
 
 AUTO_HDRS +=   $(TABLE)+tcmdif.h
 AUTO_SRCS +=   $(TABLE)+tcmdif.c
 CFILES +=      $(TABLE)+tcmdif
 
-LDLIBS +=      $(BASE_DIR)/chiark-tcl.so
+CPPFLAGS += $(foreach o, $(OTHER_EXTS), -I../$(dir $o))
+LDLIBS += $(foreach o, $(OTHER_EXTS), ../$(dir $o)$(EXTPREFIX)$(notdir $o)-$(VERSION).so)
+
+LDLIBS +=      $(BASE_DIR)/$(BASE_SHLIB).so
 
 include                $(BASE_DIR)/common.make
 include                $(BASE_DIR)/shlib.make
 
-TCMDIFARGS ?=  -p$(EXTENSION) -o$@ $(BASE_TCT) $(OTHER_TCTS) $<
+TCMDIFARGS ?=  -p$(FAMILY)_$(EXTBASE) -o$@ $(BASE_TCT) $(OTHER_TCTS) $<
 
 %+tcmdif.c:    %.tct $(BASE_TCT) $(OTHER_TCTS) $(TCMDIFGEN)
                $(TCMDIFGEN) -wc $(TCMDIFARGS)

diff --git a/base/shlib.make b/base/shlib.make
index 50eeae089ad8b3037949ef3ecb76dfe478f54e61..e69ea6c64d54d007eed54ca1e40f1a5a4a5a0b77 100644 (file)
--- a/base/shlib.make
+++ b/base/shlib.make
@@ -5,4 +5,5 @@ OBJS +=         $(OBJS_CFILES)
 TARGETS +=     $(SHLIB).so
 
 $(SHLIB).so:   $(OBJS)
-               $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $(OBJS) $(LDLIBS)
+               $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared \
+                       -Xlinker -soname=$@ $(OBJS) $(LDLIBS)

diff --git a/cdb/Makefile b/cdb/Makefile
index 96ac4aebcf56739dde2bd155352937a0f9adefb0..b3fadac313dc2482a15030fa6a07ec3214cd4873 100644 (file)
--- a/cdb/Makefile
+++ b/cdb/Makefile
@@ -2,8 +2,8 @@ BASE_DIR =      ../base
 EXTBASE =      cdb
 CFILES =       readonly writeable lookup
 OTHER_TCTS =   ../hbytes/hbytes-base.tct
-CPPFLAGS +=    -I../hbytes
-LDLIBS +=      ../hbytes/chiark_tcl_hbytes.so -lcdb
+OTHER_EXTS +=  hbytes/hbytes
+LDLIBS +=      -lcdb
 
 include ../base/extension.make
 

diff --git a/cdb/tests b/cdb/tests
index 45c90618a13a001ddf79a9d549a36a41f8b94c80..658233eac1857b745c6ccf5aa9e63442df547ef0 100755 (executable)
--- a/cdb/tests
+++ b/cdb/tests
@@ -13,7 +13,7 @@ proc addpath {p before after default} {
 
 addpath LD_LIBRARY_PATH {../base ../hbytes} {} {}
 
-load ./chiark_tcl_cdb.so
+load ./chiark_tcl_cdb-1.so
 
 #
 # CURRENTLY TESTING WITH

diff --git a/crypto/Makefile b/crypto/Makefile
index 12fccd7d604c91af53fd3822f66c7be17bdb044b..9dee1a374baf77afbb08f364328eb1d6282ff978 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -2,8 +2,8 @@ BASE_DIR =      ../base
 EXTBASE =      crypto
 CFILES =       algtables bcmode crypto hook
 OTHER_TCTS =   ../hbytes/hbytes-base.tct
-CPPFLAGS +=    -I../hbytes
-LDLIBS +=      ../hbytes/chiark_tcl_hbytes.so -lnettle
+OTHER_EXTS =   hbytes/hbytes
+LDLIBS +=      -lnettle
 
 include ../base/extension.make