Index: Makefile.in ================================================================== --- Makefile.in +++ Makefile.in @@ -1,10 +1,10 @@ prefix = UNSPECIFIED exec_prefix = @exec_prefix@ libdir = @libdir@ -TARGETS = @TARGETS@ +TARGET = @TARGET@ CC = @CC@ AR = @AR@ RANLIB = @RANLIB@ CFLAGS = @CFLAGS@ @SHOBJFLAGS@ @@ -19,14 +19,14 @@ TCLCONFIGPATH = @TCLCONFIGPATH@ TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ tcllibdir = $(shell if echo "$(libdir)" | grep '^UNSPECIFIED' >/dev/null; then echo $(TCL_PACKAGE_PATH); else echo "$(libdir)"; fi) PACKAGE_INSTALL_DIR = $(tcllibdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -TCC_CONFIGURE_OPTS = --extra-cflags='$(CPPFLAGS) $(CFLAGS)' --with-tcl=$(TCLCONFIGPATH) --sysincludepaths='{B}/include' --libpaths='{B}/lib' +TCC_CONFIGURE_OPTS = --extra-cflags='$(CPPFLAGS) $(CFLAGS)' --with-tcl=$(TCLCONFIGPATH) --sysincludepaths='{B}/include' --libpaths='{B}/lib' @TCC_CONFIGURE_OPTS@ srcdir = @srcdir@ -all: $(TARGETS) +all: $(TARGET) tcc/config.h: if [ "$(srcdir)" = "." ]; then \ cd tcc && ./configure $(TCC_CONFIGURE_OPTS); \ else \ @@ -52,15 +52,15 @@ cp tcc/libtcc.a tcltcc-static.new.a $(AR) rcu tcltcc-static.new.a tcltcc.o -$(RANLIB) tcltcc-static.new.a mv tcltcc-static.new.a tcltcc-static.a -install: $(TARGETS) pkgIndex.tcl $(srcdir)/tcc.tcl tcc/libtcc1.a $(shell echo $(srcdir)/tcc/include/*) $(srcdir)/headers.awk +install: $(TARGET) pkgIndex.tcl $(srcdir)/tcc.tcl tcc/libtcc1.a $(shell echo $(srcdir)/tcc/include/*) $(srcdir)/headers.awk $(INSTALL) -d "$(DESTDIR)$(PACKAGE_INSTALL_DIR)" $(INSTALL) -d "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/lib" $(INSTALL) -d "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include" - $(INSTALL) -m 0755 $(TARGETS) "$(DESTDIR)$(PACKAGE_INSTALL_DIR)" + $(INSTALL) -m 0755 $(TARGET) "$(DESTDIR)$(PACKAGE_INSTALL_DIR)" $(INSTALL) -m 0644 pkgIndex.tcl "$(DESTDIR)$(PACKAGE_INSTALL_DIR)" $(INSTALL) -m 0644 $(srcdir)/tcc.tcl "$(DESTDIR)$(PACKAGE_INSTALL_DIR)" $(INSTALL) -m 0644 tcc/libtcc1.a "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/lib" $(INSTALL) -m 0644 $(shell echo $(srcdir)/tcc/include/*) "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include" ( for file in tcl.h limits.h unistd.h; do echo "#include <$${file}>"; done ) | \ Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -11,31 +11,34 @@ DC_CHK_OS_INFO dnl Determine if a shared or static build is requested AC_ARG_ENABLE([static], AS_HELP_STRING([--enable-static], [build static library instead of shared library]), [ if test "$enableval" = "no"; then - target=static + TCC4TCL_TARGET=static else - target=shared + TCC4TCL_TARGET=shared fi ], [ - target=shared + TCC4TCL_TARGET=shared ]) -if test "${target}" = "shared"; then +TCC_CONFIGURE_OPTS="" +if test "${TCC4TCL_TARGET}" = "shared"; then dnl Determine how to make shared objects DC_GET_SHOBJFLAGS dnl Only export symbols we wish to expose DC_SETVERSIONSCRIPT([tcltcc.syms], [tcltcc.vers]) DC_FIND_STRIP_AND_REMOVESYMS([tcltcc.syms]) - TARGETS="tcltcc.${SHOBJEXT}" + TARGET="tcltcc.${SHOBJEXT}" else - TARGETS="tcltcc-static.a" + TARGET="tcltcc-static.a" fi -AC_SUBST(TARGETS) +AC_SUBST(TARGET) +AC_SUBST(TCC4TCL_TARGET) +AC_SUBST(TCC_CONFIGURE_OPTS) dnl Find out if we have the functions needed to open shared objects AC_SEARCH_LIBS(dlopen, dl,, [ AC_SEARCH_LIBS(shl_load, dld dl) ])