- support for apart modules taken from svn, fixed bug for dependency files *.d

- new config param INCLUDES (all includes -I goes here, CFLAGS was not good for MAKDEP)

Makefile.defs

@@ -482,6 +482,7 @@ endif
 
 CFLAGS=
 LDFLAGS=
+INCLUDES=
 # setting CFLAGS
 ifeq ($(mode), release)
 	#if i386

Makefile.modules

@@ -6,14 +6,18 @@
 #
 MOD_NAME=$(NAME:.so=)
 
-ALLDEP=Makefile ../../Makefile.sources ../../Makefile.rules \
- ../../Makefile.modules
+# allow place modules in separate directory apart from ser core
+COREPATH ?=../..
+
+ALLDEP=Makefile $(COREPATH)/Makefile.sources $(COREPATH)/Makefile.rules \
+ $(COREPATH)/Makefile.modules
 
 #override modules value, a module cannot have submodules
 override modules=
 override static_modules=
 override static_modules_path=
 
+INCLUDES += -I$(COREPATH)
 
 ifeq ($(MAKELEVEL), 0)
 # make called directly in the module dir!
@@ -26,15 +30,15 @@ endif
 else
 # called by the main Makefile
 
-ALLDEP+=../../Makefile ../../Makefile.defs
+ALLDEP+=$(COREPATH)/Makefile $(COREPATH)/Makefile.defs
 
 endif
 
-include ../../Makefile.sources
+include $(COREPATH)/Makefile.sources
 
 ifeq (,$(filter $(MOD_NAME), $(static_modules)))
 CFLAGS:=$(MOD_CFLAGS)
 LDFLAGS:=$(MOD_LDFLAGS)
 endif
 
-include ../../Makefile.rules
+include $(COREPATH)/Makefile.rules

Makefile.rules

@@ -6,7 +6,7 @@
 #
 
 #
-# Uses: NAME, ALLDEP, CC, CFLAGS, DEFS, LIBS, MKDEP, auto_gen, auto_gen_others,
+# Uses: NAME, ALLDEP, CC, CFLAGS, DEFS, INCLUDES, LIBS, MKDEP, auto_gen, auto_gen_others,
 # depends, objs, extra_objs, static_modules, static_modules_path
 # (all this must  be defined previously!,  see Makefile.defs & Makefile)
 #
@@ -15,10 +15,10 @@
 
 #implicit rules
 %.o:%.c  $(ALLDEP)
-	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) $(DEFS) -c $< -o $@
 
 %.d: %.c $(ALLDEP)
-	@set -e; $(MKDEP) $(DEFS) $< \
+	@set -e; $(MKDEP) $(INCLUDES) $(DEFS) $< \
 	|  sed 's#\(\($*D)\)\?$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \
 	[ -s $@ ] || rm -f $@