diff --git a/src/Makefile.include b/src/Makefile.include index 13f4d7375..31ad98ac4 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -28,10 +28,10 @@ LIBS = -L$(PUBLISH_DIR) ARCHITECTURE = Linux ## -## Default-Strings +## Default-Strings. Können in $(USER).mk überschrieben werden ## -MSG_COMPILE = "***** Compiling $@ *****" -MSG_SUBDIR = "===== Making $@ in $$subdir =====" +MSG_COMPILE = "---> Compiling $@" +MSG_SUBDIR = "--> Making $@ in $$subdir" ## ## user-defined makefiles @@ -138,10 +138,9 @@ subdirs-debug subdirs-release subdirs-profile subdirs-dmalloc clean depend:: @if [ -n "$(SUBDIRS)" ]; then \ for subdir in x-placeholder-dir $(SUBDIRS); do \ if [ -d $$subdir ]; then \ - echo $(MSG_SUBDIR) ; \ + echo $(MSG_SUBDIR); \ mkdir -p $$subdir/$(BUILD_DIR) ; \ $(MAKE) -C $$subdir -$(MAKEFLAGS) recurse-$@ || exit 1; \ - echo; \ fi \ done \ fi diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 05a9dc7ba..7750da3dd 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: laws.c,v 1.10 2001/02/10 14:18:00 enno Exp $ + * $Id: laws.c,v 1.11 2001/02/10 22:02:10 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -23,9 +23,7 @@ #include #include "laws.h" -#ifdef USE_GM_COMMANDS -# include -#endif +#include #ifdef OLD_TRIGGER # include "old/trigger.h" diff --git a/src/enno.mk b/src/enno.mk index cd604fdf3..9a41c900f 100644 --- a/src/enno.mk +++ b/src/enno.mk @@ -10,3 +10,5 @@ LD=gcc AR=ar CC=gcc INSTALL=install +MSG_COMPILE = "---> Compiling $@ " +MSG_SUBDIR = "--> Making $@ in $$subdir " diff --git a/src/eressea/main.c b/src/eressea/main.c index bf22f3f84..9285fbb54 100644 --- a/src/eressea/main.c +++ b/src/eressea/main.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: main.c,v 1.12 2001/02/10 19:24:05 enno Exp $ + * $Id: main.c,v 1.13 2001/02/10 22:02:10 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -131,9 +131,7 @@ game_init(void) init_items(); init_attributes(); -#ifdef USE_GM_COMMANDS init_gmcmd(); -#endif init_conversion(); init_museum();