From fa9a1b5e78c3af94f9a69f52aef0b666c0d5cf8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Mon, 20 Jul 2009 00:52:03 +0200
Subject: More Nim->Slimber renaming.


diff --git a/Makefile b/Makefile
index 32fd6ff..ab137cd 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,8 @@ endif
 ifeq ($(BUILD_LIMBER),yes)
 include Limber/Makefile.inc
 endif
-ifeq ($(BUILD_NIM),yes)
-include Nim/Makefile.inc
+ifeq ($(BUILD_SLIMBER),yes)
+include Slimber/Makefile.inc
 endif
 include QA/Makefile.inc
 ################################################################################
diff --git a/Makefile.config.in b/Makefile.config.in
index 98eae9a..ddb409b 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -26,6 +26,6 @@ WIN32=@CONFIG_WIN32@
 MACOSX=@CONFIG_MACOSX@
 BUILD_SWIFT=@BUILD_SWIFT@
 BUILD_LIMBER=@BUILD_LIMBER@
-BUILD_NIM=@BUILD_NIM@
+BUILD_SLIMBER=@BUILD_SLIMBER@
 QMAKE=@QMAKE@
 ARCH=@ARCH@
diff --git a/Slimber/Makefile.inc b/Slimber/Makefile.inc
index 2008c6b..045ef17 100644
--- a/Slimber/Makefile.inc
+++ b/Slimber/Makefile.inc
@@ -1,16 +1,16 @@
-NIM_TARGET = Nim/nim
-NIM_SOURCES = \
-	Nim/main.cpp
-NIM_OBJECTS = \
-	$(NIM_SOURCES:.cpp=.o) \
+SLIMBER_TARGET = Slimber/slimber
+SLIMBER_SOURCES = \
+	Slimber/main.cpp
+SLIMBER_OBJECTS = \
+	$(SLIMBER_SOURCES:.cpp=.o) \
 
-.PHONY: nim
-nim: $(NIM_TARGET)
+.PHONY: slimber
+slimber: $(SLIMBER_TARGET)
 
-$(NIM_TARGET): $(SWIFTEN_TARGET) $(NIM_OBJECTS)
-	$(QUIET_LINK)$(CXX) -o $(NIM_TARGET) $(NIM_OBJECTS) $(LDFLAGS) $(SWIFTEN_TARGET) $(LIBS)
+$(SLIMBER_TARGET): $(SWIFTEN_TARGET) $(SLIMBER_OBJECTS)
+	$(QUIET_LINK)$(CXX) -o $(SLIMBER_TARGET) $(SLIMBER_OBJECTS) $(LDFLAGS) $(SWIFTEN_TARGET) $(LIBS)
 
-#TARGETS += $(NIM_TARGET)
-CLEANFILES += $(NIM_OBJECTS)
+#TARGETS += $(SLIMBER_TARGET)
+CLEANFILES += $(SLIMBER_OBJECTS)
 DEPS += \
-	$(NIM_SOURCES:.cpp=.dep) \
+	$(SLIMBER_SOURCES:.cpp=.dep) \
diff --git a/configure.in b/configure.in
index ddb423f..7fa6c26 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ esac
 
 AC_CHECK_FILE([Swift/Makefile.inc], [BUILD_SWIFT="yes"], [BUILD_SWIFT="no"])
 AC_CHECK_FILE([Limber/Makefile.inc], [BUILD_LIMBER="yes"], [BUILD_LIMBER="no"])
-AC_CHECK_FILE([Nim/Makefile.inc], [BUILD_NIM="yes"], [BUILD_NIM="no"])
+AC_CHECK_FILE([Slimber/Makefile.inc], [BUILD_SLIMBER="yes"], [BUILD_SLIMBER="no"])
 
 ################################################################################
 # Configure options
@@ -231,7 +231,7 @@ AC_SUBST(CONFIG_HAVE_LIBXML)
 AC_SUBST(QMAKE)
 AC_SUBST(BUILD_SWIFT)
 AC_SUBST(BUILD_LIMBER)
-AC_SUBST(BUILD_NIM)
+AC_SUBST(BUILD_SLIMBER)
 AC_SUBST(ARCH)
 
 AC_CONFIG_FILES([Makefile.config])
-- 
cgit v0.10.2-6-g49f6