Merge branch 'master' of git://factorcode.org/git/factor

Makefile

@@ -17,11 +17,12 @@ else
 	CFLAGS += -O3 $(SITE_CFLAGS)
 endif
 
-CONFIG = $(shell ./build-support/factor.sh config-target)
-include $(CONFIG)
-
 ENGINE = $(DLL_PREFIX)factor$(DLL_SUFFIX)$(DLL_EXTENSION)
 
+ifdef CONFIG
+	include $(CONFIG)
+endif
+
 DLL_OBJS = $(PLAF_DLL_OBJS) \
 	vm/alien.o \
 	vm/bignum.o \
@@ -128,21 +129,11 @@ solaris-x86-32:
 solaris-x86-64:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.solaris.x86.64
 
-freetype6.dll:
+winnt-x86-32:
-	wget $(DLL_PATH)/freetype6.dll
-	chmod 755 freetype6.dll
-
-zlib1.dll:
-	wget $(DLL_PATH)/zlib1.dll
-	chmod 755 zlib1.dll
-
-windows-dlls: freetype6.dll zlib1.dll
-
-winnt-x86-32: windows-dlls
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
 	$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
 
-winnt-x86-64: windows-dlls
+winnt-x86-64:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
 	$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
 
@@ -159,7 +150,7 @@ macosx.app: factor
 		-change libfactor.dylib \
 		@executable_path/../Frameworks/libfactor.dylib \
 		Factor.app/Contents/MacOS/factor
-        
+
 factor: $(DLL_OBJS) $(EXE_OBJS)
 	$(LINKER) $(ENGINE) $(DLL_OBJS)
 	$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \

build-support/factor.sh

@@ -260,7 +260,6 @@ echo_build_info() {
     $ECHO FACTOR_BINARY=$FACTOR_BINARY
     $ECHO FACTOR_LIBRARY=$FACTOR_LIBRARY
     $ECHO FACTOR_IMAGE=$FACTOR_IMAGE
-    $ECHO CONFIG_TARGET=$CONFIG_TARGET
     $ECHO MAKE_TARGET=$MAKE_TARGET
     $ECHO BOOT_IMAGE=$BOOT_IMAGE
     $ECHO MAKE_IMAGE_TARGET=$MAKE_IMAGE_TARGET
@@ -290,30 +289,23 @@ set_build_info() {
     if [[ $OS == macosx && $ARCH == ppc ]] ; then
         MAKE_IMAGE_TARGET=macosx-ppc
         MAKE_TARGET=macosx-ppc
-	CONFIG_TARGET=macosx.ppc
     elif [[ $OS == linux && $ARCH == ppc ]] ; then
         MAKE_IMAGE_TARGET=linux-ppc
         MAKE_TARGET=linux-ppc
-	CONFIG_TARGET=linux.ppc
     elif [[ $OS == winnt && $ARCH == x86 && $WORD == 64 ]] ; then
         MAKE_IMAGE_TARGET=winnt-x86.64
         MAKE_TARGET=winnt-x86-64
-	CONFIG_TARGET=windows.nt.x86.64
     elif [[ $OS == winnt && $ARCH == x86 && $WORD == 32 ]] ; then
         MAKE_IMAGE_TARGET=winnt-x86.32
         MAKE_TARGET=winnt-x86-32
-	CONFIG_TARGET=windows.nt.x86.32
     elif [[ $ARCH == x86 && $WORD == 64 ]] ; then
         MAKE_IMAGE_TARGET=unix-x86.64
         MAKE_TARGET=$OS-x86-64
-	CONFIG_TARGET=$OS.x86.64
     else
         MAKE_IMAGE_TARGET=$ARCH.$WORD
         MAKE_TARGET=$OS-$ARCH-$WORD
-        CONFIG_TARGET=$OS.$ARCH.$WORD
     fi
     BOOT_IMAGE=boot.$MAKE_IMAGE_TARGET.image
-    CONFIG_TARGET=vm/Config.$CONFIG_TARGET
 }
 
 parse_build_info() {
@@ -581,6 +573,5 @@ case "$1" in
     dlls) get_config_info; maybe_download_dlls;;
     net-bootstrap) get_config_info; update_boot_images; bootstrap ;;
     make-target) ECHO=false; find_build_info; echo $MAKE_TARGET ;;
-    config-target) ECHO=false; find_build_info; echo $CONFIG_TARGET ;;
     *) usage ;;
 esac