30 30 SH_LIBJIM := $(LIBJIM) 31 31 CPPFLAGS += $(SH_CFLAGS) 32 32 DEF_LD_PATH := @LD_LIBRARY_PATH@=`pwd` 33 33 endif 34 34 35 35 .EXPORT_ALL_VARIABLES: 36 36 37 -OBJS := load-static-exts.o jim-subcmd.o jim-interactive.o jim-format.o jim.o utf8.o jimregexp.o @EXTRA_OBJS@ 37 +OBJS := _load-static-exts.o jim-subcmd.o jim-interactive.o jim-format.o jim.o utf8.o jimregexp.o @EXTRA_OBJS@ 38 38 39 39 JIMSH := jimsh@EXEEXT@ 40 40 41 -EXTENSION_OBJS := $(patsubst %,jim-%.o,@JIM_EXTENSIONS@) 42 -EXTENSION_MODS := $(patsubst %,%.so,@JIM_MOD_EXTENSIONS@) 41 +JIM_EXTENSIONS := @JIM_STATIC_C_EXTS@ @JIM_STATIC_TCL_EXTS@ 42 +C_EXT_OBJS := $(patsubst %,jim-%.o,@JIM_STATIC_C_EXTS@) $(patsubst %,_jim-%.o,@JIM_STATIC_TCL_EXTS@) 43 +C_EXT_SHOBJS := $(patsubst %,%.so,@JIM_MOD_EXTENSIONS@) 43 44 EXTENSION_TCL := $(patsubst %,%.tcl,@JIM_TCL_EXTENSIONS@) 44 45 45 46 .PRECIOUS: jim-%.c 46 47 47 -all: $(JIMSH) $(EXTENSION_MODS) 48 +all: $(JIMSH) $(C_EXT_SHOBJS) 48 49 49 50 # Create C extensions from pure Tcl extensions 50 -jim-%.c: %.tcl 51 +_jim-%.c: %.tcl 51 52 @tclsh@ @srcdir@/make-c-ext.tcl $< >$@ || ( rm $@; exit 1) 52 53 53 -initjimsh.c: initjimsh.tcl 54 +_initjimsh.c: initjimsh.tcl 54 55 @tclsh@ @srcdir@/make-c-ext.tcl $< >$@ || ( rm $@; exit 1) 55 56 56 57 docs: Tcl.html 57 58 58 -$(JIMSH): $(LIBJIM) jimsh.o initjimsh.o 59 - $(CC) $(CFLAGS) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) 59 +$(JIMSH): $(LIBJIM) jimsh.o _initjimsh.o 60 + $(CC) $(CFLAGS) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o _initjimsh.o $(LIBJIM) $(LDLIBS) 60 61 61 62 install: all docs $(EXTENSION_TCL) install-exec 62 63 mkdir -p $(DESTDIR)$(prefix)/lib/jim 63 64 cp $(LIBJIM) $(DESTDIR)$(prefix)/lib 64 - cp @srcdir@/README.extensions $(EXTENSION_MODS) $(EXTENSION_TCL) $(DESTDIR)$(prefix)/lib/jim 65 + cp @srcdir@/README.extensions $(C_EXT_SHOBJS) $(EXTENSION_TCL) $(DESTDIR)$(prefix)/lib/jim 65 66 mkdir -p $(DESTDIR)$(prefix)/include 66 67 cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-nvp.h @srcdir@/jim-signal.h \ 67 68 @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)$(prefix)/include 68 69 cp jim-config.h $(DESTDIR)$(prefix)/include 69 70 mkdir -p $(DESTDIR)$(prefix)/doc/jim 70 71 cp Tcl.html $(DESTDIR)$(prefix)/doc/jim 71 72 ................................................................................ 72 73 install-exec: all 73 74 mkdir -p $(DESTDIR)$(prefix)/bin 74 75 cp $(JIMSH) $(DESTDIR)$(prefix)/bin 75 76 76 77 uninstall: 77 78 rm -f $(DESTDIR)$(prefix)/bin/$(JIMSH) 78 79 rm -f $(DESTDIR)$(prefix)/lib/$(LIBJIM) 79 - for i in README.extensions $(EXTENSION_MODS) $(EXTENSION_TCL); do rm -f $(DESTDIR)$(prefix)/lib/jim/$$i; done 80 + for i in README.extensions $(C_EXT_SHOBJS) $(EXTENSION_TCL); do rm -f $(DESTDIR)$(prefix)/lib/jim/$$i; done 80 81 rm -f $(DESTDIR)$(prefix)/include/jim*.h 81 82 rm -f $(DESTDIR)$(prefix)/doc/jim/Tcl.html 82 83 83 84 test: $(JIMSH) 84 85 $(DEF_LD_PATH) $(MAKE) jimsh=`pwd`/jimsh -C @srcdir@/tests 85 86 86 -$(OBJS) $(EXTENSION_OBJS): Makefile 87 +$(OBJS) $(C_EXT_OBJS): Makefile 87 88 88 -ifneq (@JIM_UTF8@,) 89 +ifeq (@JIM_UTF8@,1) 89 90 # Generate the unicode case mapping 90 -utf8.o: unicode_mapping.c 91 +utf8.o: _unicode_mapping.c 91 92 92 -unicode_mapping.c: @srcdir@/UnicodeData.txt @srcdir@/parse-unidata.tcl 93 +_unicode_mapping.c: @srcdir@/UnicodeData.txt @srcdir@/parse-unidata.tcl 93 94 @tclsh@ @srcdir@/parse-unidata.tcl @srcdir@/UnicodeData.txt >$@ || ( rm $@; exit 1) 94 95 endif 95 96 96 -load-static-exts.c: @srcdir@/make-load-static-exts.tcl Makefile 97 - @tclsh@ @srcdir@/make-load-static-exts.tcl @JIM_EXTENSIONS@ >$@ || ( rm $@; exit 1) 97 +_load-static-exts.c: @srcdir@/make-load-static-exts.tcl Makefile 98 + @tclsh@ @srcdir@/make-load-static-exts.tcl $(JIM_EXTENSIONS) >$@ || ( rm $@; exit 1) 98 99 99 100 ifeq ($(jim_libtype),static) 100 -$(LIBJIM): $(OBJS) $(EXTENSION_OBJS) 101 +$(LIBJIM): $(OBJS) $(C_EXT_OBJS) 101 102 $(AR) cr $@ $^ 102 103 $(RANLIB) $@ 103 104 else 104 -$(LIBJIM): $(OBJS) $(EXTENSION_OBJS) 105 +$(LIBJIM): $(OBJS) $(C_EXT_OBJS) 105 106 $(CC) $(CFLAGS) $(LDFLAGS) $(SH_LDFLAGS) -o $@ $^ $(LDLIBS) 106 107 endif 107 108 108 109 %.so: jim-%.c 109 110 $(CC) $(CFLAGS) $(CPPFLAGS) $(SHOBJ_CFLAGS) -c -o $*.o $^ 110 111 $(CC) $(CFLAGS) $(LDFLAGS) $(SHOBJ_LDFLAGS) -o $@ $*.o $(SH_LIBJIM) $(LDLIBS) 111 112 112 113 Tcl.html: jim_tcl.txt 113 114 @tclsh@ @srcdir@/make-index $^ | asciidoc -o $@ -d manpage - || cp @srcdir@/Tcl_shipped.html Tcl.html 114 115 115 116 clean: 116 - rm -f *.o *.so lib*.a $(JIMSH) Tcl.html unicode_mapping.c load-static-exts.c initjimsh.c @GENERATED_SRCS@ 117 + rm -f *.o *.so lib*.a $(JIMSH) Tcl.html _*.c 117 118 118 119 distclean: clean 119 120 rm -f jimautoconf.h jim-config.h Makefile config.log autosetup/jimsh0@EXEEXT@ 120 121 121 122 ship: Tcl.html 122 123 cp Tcl.html Tcl_shipped.html 123 124