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

[chiark-tcl.git] / base / extension.make

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)