From c0ed63b84a9c9c1338882bf12c70aed446eaf5ec Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Tue, 30 Jan 2001 16:14:16 +0000
Subject: [PATCH] =?UTF-8?q?-=20Kleine=20=C3=84nderungen=20im=20Makefile=20?=
 =?UTF-8?q?-=20Beispiel=20f=C3=BCr=20Custom-Einstellungen=20in=20Makefile.?=
 =?UTF-8?q?corwin=20-=20Fehlender=20Prototyp=20f=C3=BCr=20igetstrtoken()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Makefile                |  6 ++++++
 src/Makefile.corwin         |  8 ++++++++
 src/Makefile.include        | 10 ++++++----
 src/common/kernel/eressea.h |  3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 src/Makefile.corwin

diff --git a/src/Makefile b/src/Makefile
index 33bdea685..481f8d7da 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,6 +8,12 @@ SUBDIRS = \
 #  askalon \
 #  tools \
 
+ifeq ($(HOST),amber)
+  ifeq ($(USER),eressea)
+    include Makefile.corwin
+  endif
+endif
+
 include Makefile.include
 
 
diff --git a/src/Makefile.corwin b/src/Makefile.corwin
new file mode 100644
index 000000000..9eb6e97ab
--- /dev/null
+++ b/src/Makefile.corwin
@@ -0,0 +1,8 @@
+
+ifndef ERESSEA
+	export ERESSEA=$(PWD)
+endif
+
+# Hier definieren, damit nicht '@gcc'
+export CC=gcc
+
diff --git a/src/Makefile.include b/src/Makefile.include
index 6b27cfac7..6563b394d 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -13,8 +13,8 @@ ARFLAGS = cr
 CTAGS      = ctags
 CTAGSFLAGS = --langmap=c:.c.h
 
-CC      = gcc
-CFLAGS  = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
+CC      ?= @gcc
+CFLAGS  ?= -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
            -Wpointer-arith -Werror-implicit-function-declaration \
 	   -Wno-char-subscripts \
        	   -march=pentiumpro -fPIC $(INCLUDES)
@@ -58,7 +58,8 @@ endif
 
 ifeq ($(CONFIG), release)
   BUILD_DIR  = Release-$(ARCHITECTURE)
-  CFLAGS    += -O4 -funroll-loops -fomit-frame-pointer
+  CFLAGS    += -O4 -s -funroll-loops -fomit-frame-pointer
+  LDFLAGS   += -s
 endif
 
 ifeq ($(CONFIG), profile)
@@ -81,6 +82,7 @@ depend::
 	$(DEPEND) $(CFLAGS) $(DEFINES) $(INCDIRS) $(SOURCES) >| .depend
 endif
 
+
 #
 ## Tags
 #
@@ -135,7 +137,7 @@ $(BUILD_DIR) $(PUBLISH_DIR):
 $(BUILD_DIR)/%:: $(BUILD_DIR)
 $(BUILD_DIR)/%.o:: %.c
 	@echo "Compiling $@"
-	@$(CC) -o $@ -c $< $(CFLAGS)
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 ##
 ## conversion code for old triggers - should only be used for free eressea,
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 554e4eb70..91afd6a45 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: eressea.h,v 1.3 2001/01/28 08:01:51 enno Exp $
+ *	$Id: eressea.h,v 1.4 2001/01/30 16:14:16 corwin Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -932,6 +932,7 @@ int geti(void);
 keyword_t igetkeyword(const char *s);
 keyword_t getkeyword(void);
 keyword_t findkeyword(const char *s);
+char *igetstrtoken(const char *s);
 
 #define BASE36_VERSION 93
 extern int atoi36(const char * s);