das alte makefile behalten

src/Makefile

@@ -1,38 +1,12 @@
-MODULES := common eressea common/triggers common/items common/spells common/races common/attributes common/gamecode common/kernel common/util common/modules
+TARGETS = subdirs
 
-CC = gcc
+SUBDIRS = \
-CFLAGS += -Wall -Wwrite-strings -Wstrict-prototypes \
+  common \
-           -Werror-implicit-function-declaration \
+  eressea \
-           -Wno-char-subscripts 
+  mapper
 
-# look for include files in
+#  askalon
-# each of the modules
-CFLAGS += -I/cygwin/usr/include
-CFLAGS += -I.
-CFLAGS += $(patsubst %,-I%,$(MODULES))
-# extra libraries if required
-LIBS :=
-# each module will add to this
-SRC :=
 
-# include the description for
+include Makefile.include
-# each module
-include $(patsubst %,%/module.mk,$(MODULES))
-# determine the object files
-OBJ := $(patsubst %.c,%.o, $(filter %.c,$(SRC))) \
-       $(patsubst %.y,%.o, $(filter %.y,$(SRC)))
-# link the program
-eressea: $(OBJ)
-	$(CC) -o $@ $(OBJ) $(LIBS)
 
-%.o: %.c
+## more definitions
-	@echo Compiling $@
-	@$(CC) $(CFLAGS) -c -o $@ $<
-
-# include the C include
-# dependencies
-include $(OBJ:.o=.d)
-# calculate C include
-# dependencies
-%.d: %.c
-	gcc -MM -MG $(CFLAGS) $< > $@

src/common/kernel/movement.c

@@ -1785,7 +1785,6 @@ piracy(unit *u)
 {
 	region *r = u->region;
 	ship *sh = u->ship, *sh2;
-	unit *cap;
 	direction_t dir, target_dir = NODIRECTION;
 	int         aff[MAXDIRECTIONS];
 	int         saff = 0;
@@ -1840,7 +1839,7 @@ piracy(unit *u)
 					&& check_takeoff(sh, r, rc) == true) {
 
 				for(sh2 = rc->ships; sh2; sh2 = sh2->next) {
-					cap = shipowner(rc, sh2);
+					unit * cap = shipowner(rc, sh2);
 					if (cap && (intlist_find(il, cap->faction->no) || all)) {
 						aff[dir]++;
 					}