X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=526779d801821475fced72004b45d335f45ff468;hb=e4839dc44353952dde32620035c07863b918eb15;hp=fd30cbb08c7687d641b74f2a9cd5583fb3d7180f;hpb=558a44bf47370b68b14d0837bfae13c651ecf5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index fd30cbb08..526779d80 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -8,6 +8,7 @@
 
 CC = @CC@
 SYSTEM = @SYSTEM@
+BUILDPATH = @BUILD_DIR@
 SOCKETENGINE = @SOCKETENGINE@
 CXXFLAGS += -pipe -fPIC -DPIC
 LDLIBS = -pthread -lstdc++
@@ -40,10 +41,12 @@ INSTMODE = 0755
   LDLIBS += -ldl
   SHARED = -bundle -twolevel_namespace -undefined dynamic_lookup
   CORELDFLAGS = -dynamic -bind_at_load -L.
+@ELSIFEQ $(SYSTEM) interix
+  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
 @ENDIF 
 
 @IFDEF D
-    CXXFLAGS += -g3
+    CXXFLAGS += -g3 -Werror
     HEADER = debug-header
 @ELSE
     CXXFLAGS += -g1
@@ -51,17 +54,12 @@ INSTMODE = 0755
 @ENDIF
 FOOTER = finishmessage
 
-CXXFLAGS += -I../include
+CXXFLAGS += -Iinclude
 
 @GNU_ONLY MAKEFLAGS += --no-print-directory
 
 @GNU_ONLY SOURCEPATH = $(shell /bin/pwd)
 @BSD_ONLY SOURCEPATH != /bin/pwd
-@IFDEF O
-    BUILDPATH = $(O)
-@ELSE
-    BUILDPATH = src
-@ENDIF
 
 @IFDEF V
     RUNCC = $(CC)
@@ -69,11 +67,11 @@ CXXFLAGS += -I../include
 @ELSE
     @GNU_ONLY MAKEFLAGS += --silent
     @BSD_ONLY MAKE += -s
-    RUNCC = $(SOURCEPATH)/make/run-cc.pl $(CC)
+    RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
 @ENDIF
 
 @DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-@DO_EXPORT BASE CONPATH MODPATH BINPATH SOURCEPATH
+@DO_EXPORT BASE CONPATH MODPATH BINPATH SOURCEPATH BUILDPATH
 
 # Default target
 TARGET = all
@@ -94,8 +92,8 @@ TARGET = all
 all: $(FOOTER)
 
 target: $(HEADER)
-@GNU_ONLY 	$(MAKEENV) $(MAKE) -C $(BUILDPATH) -f ../make/gnu-real.mk $(TARGET)
-@BSD_ONLY 	$(MAKEENV) $(MAKE) -C $(BUILDPATH) -f ../make/bsd-real.mk $(TARGET)
+	$(MAKEENV) perl make/calcdep.pl
+	$(MAKEENV) $(MAKE) -C $(BUILDPATH) -f real.mk $(TARGET)
 
 debug:
 	@${MAKE} D=1 all
@@ -118,7 +116,7 @@ mod-header:
 	@echo 'Building single module:'
 
 mod-footer: target
-	@echo 'To install, copy src/$(TARGET) to $(MODPATH)'
+	@echo 'To install, copy $(BUILDPATH)/$(TARGET) to $(MODPATH)'
 	@echo 'Or, run "make install"'
 
 std-header:
@@ -145,9 +143,9 @@ install: target@EXTRA_DIR@
 	@-install -d -m $(INSTMODE) $(BINPATH)
 	@-install -d -m $(INSTMODE) $(CONPATH)
 	@-install -d -m $(INSTMODE) $(MODPATH)
-	-install -m $(INSTMODE) src/modules/*.so $(MODPATH)
+	-install -m $(INSTMODE) $(BUILDPATH)/modules/*.so $(MODPATH)
+	-install -m $(INSTMODE) $(BUILDPATH)/bin/inspircd $(BINPATH)
 	-install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null
-	-install -m $(INSTMODE) src/inspircd $(BINPATH)
 	@$(MAKEENV) make/install-extras.pl install
 	@echo ""
 	@echo "*************************************"
@@ -159,12 +157,20 @@ install: target@EXTRA_DIR@
 	@echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
 	@echo "*************************************"
 
+@GNU_ONLY RCS_FILES = $(wildcard .git/index .svn/entries)
+@GNU_ONLY GNUmakefile: .Makefile.inc configure .config.cache $(RCS_FILES)
+@GNU_ONLY 	./configure -update
+
 clean:
 	@echo Cleaning...
-	@rm -f src/inspircd src/modes/modeclasses.a
-	@rm -f src/*.so src/modules/*.so src/modules/*/*.so
-	@rm -f src/*.o src/*/*.o src/modules/*/*.o
-	@rm -f src/.*.d src/*/.*.d src/modules/*/.*.d
+	@-rm -f src/inspircd src/modes/modeclasses.a include/inspircd_se_config.h
+	@-rm -f src/*.so src/modules/*.so src/commands/*.so
+	@-rm -f src/*.o src/*/*.o src/modules/*/*.o
+	@-rm -f src/.*.d src/*/.*.d src/modules/*/.*.d
+	@-rm -f $(BUILDPATH)/bin/inspircd $(BUILDPATH)/include $(BUILDPATH)/real.mk
+	@-rm -rf $(BUILDPATH)/obj $(BUILDPATH)/modules
+	@-rmdir $(BUILDPATH)/bin 2>/dev/null
+	@-rmdir $(BUILDPATH) 2>/dev/null
 	@echo Completed.
 
 deinstall:
@@ -180,12 +186,13 @@ launchd_dir:
 configureclean:
 	rm -f .config.cache
 	rm -f src/modules/Makefile
+	rm -f src/commands/Makefile
 	rm -f src/Makefile
 	-rm -f Makefile
 	rm -f BSDmakefile
 	rm -f GNUmakefile
 	rm -f include/inspircd_config.h
-	rm -f include/inspircd_se_config.h
+	rm -f include/inspircd_version.h
 
 distclean: clean configureclean
 
@@ -197,7 +204,6 @@ help:
 	@echo 'Flags:'
 	@echo ' V=1       Show the full command being executed instead of "BUILD: dns.cpp"'
 	@echo ' D=1       Enable debug build, for module development or crash tracing'
-	@echo ' O=objdir  Use an alternate location for storing object files'
 	@echo ' -j <N>    Run a parallel build using N jobs'
 	@echo ''
 	@echo 'User targets:'
@@ -206,10 +212,9 @@ help:
 	@echo '           Currently installs to ${BASE}'
 	@echo ' debug     Compile a debug build. Equivalent to "make D=1 all"'
 	@echo ''
-	@echo ' M=m_foo   Builds a single module'
-	@echo ' T=target  Builds a user-specified target'
-	@echo '           Target can be a file path relative to src/, or one of:'
-	@echo '            inspircd  modules'
+	@echo ' M=m_foo   Builds a single module (cmd_foo also works here)'
+	@echo ' T=target  Builds a user-specified target, such as "inspircd" or "modules"'
+	@echo '           Other targets are specified by their path in the build directory'
 	@echo '           Multiple targets may be separated by a space'
 	@echo ''
 	@echo ' clean     Cleans object files produced by the compile'