X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=base%2Fextension.make;h=ed48edc65dc8e1c1b23dffb05fccc9a0272c408d;hb=ceed4cf646a34245b3bc88089a2187ebf7a41f0f;hp=d9ae4794fb9863ae9cff9917f6d5e2c1dc1db9eb;hpb=82f88c53ddb84e42c770c23feb9bb0ee18341188;p=chiark-tcl.git

diff --git a/base/extension.make b/base/extension.make
index d9ae479..ed48edc 100644
--- a/base/extension.make
+++ b/base/extension.make
@@ -1,23 +1,46 @@
-
-EXTENSION ?=	chiark_tcl_$(EXTBASE)
-SHLIB ?=	$(EXTENSION)
+# base code for various Tcl extensions
+# Copyright 2006 Ian Jackson
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+
+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) $<
+TCMDIFARGS ?=	-p$(FAMILY)_$(EXTBASE) -o$@ $(BASE_TCT) $(OTHER_TCTS) $<
 
-%+tcmdif.c:	%.tct $(BASE_TCT) $(TCMDIFGEN)
+%+tcmdif.c:	%.tct $(BASE_TCT) $(OTHER_TCTS) $(TCMDIFGEN)
 		$(TCMDIFGEN) -wc $(TCMDIFARGS)
 
-%+tcmdif.h:	%.tct $(BASE_TCT) $(TCMDIFGEN)
+%+tcmdif.h:	%.tct $(BASE_TCT) $(OTHER_TCTS) $(TCMDIFGEN)
 		$(TCMDIFGEN) -wh $(TCMDIFARGS)
 
 include		$(BASE_DIR)/final.make