~ chicken-core (chicken-5) 1c7765a5267023aac8506841832a45b0e4d2c7ba
commit 1c7765a5267023aac8506841832a45b0e4d2c7ba
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Jan 4 09:44:40 2010 +0100
Commit: zbigniew <zbigniewsz@gmail.com>
CommitDate: Sat Jan 9 00:51:49 2010 -0600
removed more traces of chicken-setup
diff --git a/Makefile.cross-linux-mingw b/Makefile.cross-linux-mingw
index 70d664fc..8bcaacb5 100644
--- a/Makefile.cross-linux-mingw
+++ b/Makefile.cross-linux-mingw
@@ -89,7 +89,7 @@ include $(SRCDIR)/defaults.make
ifndef BUILD_SETUP_TOOLS
TARGETS = libchicken$(A) libuchicken$(A) chicken$(EXE) csi$(EXE) \
chicken-profile$(EXE) csc$(EXE) libchicken$(SO) \
- libuchicken$(SO) chicken-setup$(EXE) \
+ libuchicken$(SO) \
libchickengui$(SO) chicken-bug$(EXE)
else
TARGETS = libchicken$(A) libuchicken$(A) chicken$(EXE) csi$(EXE) \
diff --git a/Makefile.mingw b/Makefile.mingw
index e338d574..2e39774e 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -103,8 +103,7 @@ all: libchicken$(A) libuchicken$(A) \
$(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)$(EXE) \
$(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)$(EXE) \
$(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-setup$(PROGRAM_SUFFIX)$(EXE)
+ $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)$(EXE)
chicken-config.h: chicken-defaults.h
echo #define HAVE_DIRENT_H 1 >$@
diff --git a/Makefile.mingw-msys b/Makefile.mingw-msys
index 560f2a5a..ee7552e3 100644
--- a/Makefile.mingw-msys
+++ b/Makefile.mingw-msys
@@ -91,8 +91,7 @@ all: libchicken$(A) libuchicken$(A) \
$(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)$(EXE) \
$(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)$(EXE) \
$(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-setup$(PROGRAM_SUFFIX)$(EXE)
+ $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)$(EXE)
chicken-config.h: chicken-defaults.h
echo "#define HAVE_DIRENT_H 1" >$@
diff --git a/defaults.make b/defaults.make
index adc65485..ae66cd1f 100644
--- a/defaults.make
+++ b/defaults.make
@@ -312,7 +312,6 @@ CSC_PROGRAM = $(PROGRAM_PREFIX)csc$(PROGRAM_SUFFIX)
CSI_PROGRAM = $(PROGRAM_PREFIX)csi$(PROGRAM_SUFFIX)
CHICKEN_PROFILE_PROGRAM = $(PROGRAM_PREFIX)chicken-profile$(PROGRAM_SUFFIX)
CHICKEN_INSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)
-CHICKEN_SETUP_PROGRAM = $(PROGRAM_PREFIX)chicken-setup$(PROGRAM_SUFFIX)
CHICKEN_UNINSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)
CHICKEN_STATUS_PROGRAM = $(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)
CHICKEN_BUG_PROGRAM = $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)
@@ -343,7 +342,6 @@ TARGETLIBS ?= libchicken$(A) libuchicken$(A) \
TARGETS ?= $(TARGETLIBS) $(CHICKEN_SHARED_EXECUTABLE) \
$(CSI_SHARED_EXECUTABLE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
$(CSC_PROGRAM)$(EXE) $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
- $(CHICKEN_SETUP_PROGRAM)$(EXE) \
$(CHICKEN_STATUS_PROGRAM)$(EXE) setup-download.so setup-api.so \
$(CHICKEN_BUG_PROGRAM)$(EXE) \
$(IMPORT_LIBRARIES:%=%.import.so)
diff --git a/rules.make b/rules.make
index ed75fe3d..913a64f7 100644
--- a/rules.make
+++ b/rules.make
@@ -851,7 +851,7 @@ install:
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(CHICKEN_PROGRAM)$(EXE) \
$(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
$(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
- $(CHICKEN_STATUS_PROGRAM)$(EXE) $(CHICKEN_SETUP_PROGRAM)$(EXE) \
+ $(CHICKEN_STATUS_PROGRAM)$(EXE) \
$(LIBCHICKEN_SO_FILE) $(LIBUCHICKEN_SO_FILE) \
$(IMPORT_LIBRARIES:%=%.so) $(IMPORT_LIBRARIES:%=%.import.so)
$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) CONFIG=$(CONFIG) NEEDS_RELINKING=no \
@@ -905,7 +905,6 @@ ifndef STATICBUILD
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_INSTALL_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_STATUS_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_SETUP_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
ifneq ($(POSTINSTALL_PROGRAM),true)
$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM)"
$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_UNINSTALL_PROGRAM)"
@@ -1005,8 +1004,7 @@ uninstall:
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_UNINSTALL_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_STATUS_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CSC_PROGRAM)$(EXE)" \
- "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_BUG_PROGRAM)$(EXE)" \
- "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_SETUP_PROGRAM)$(EXE)"
+ "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_BUG_PROGRAM)$(EXE)"
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)libchicken$(A) "
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)libuchicken$(A) "
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)libchicken$(SO)"
Trap