X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Fmain.mk;h=bdb4d9762566165b0cf4d912994cab1c6ede6a3a;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=a3daaee1073773e41578bfb6afd866b42e867258;hpb=cd6b7a8cda83f54679634624e84e92b91cf80683;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/template/main.mk b/make/template/main.mk
index a3daaee10..bdb4d9762 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -1,8 +1,27 @@
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+#   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+#
+# This file is part of InspIRCd.  InspIRCd is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+#
 #               InspIRCd Main Makefile
 #
-#       (C) InspIRCd Development Team, 2002-2010
 # This file is automagically generated by configure, from
-# make/templates/main.mk. Any changes make to the generated
+# make/template/main.mk. Any changes made to the generated
 #     files will go away whenever it is regenerated!
 #
 # Please do not edit unless you know what you're doing. This
@@ -10,87 +29,105 @@
 # them by configure.
 #
 
-CC = @CC@
+
+CXX = @CXX@
+COMPILER = @COMPILER@
 SYSTEM = @SYSTEM@
 BUILDPATH = @BUILD_DIR@
 SOCKETENGINE = @SOCKETENGINE@
-CXXFLAGS = -pipe -fPIC -DPIC
-LDLIBS = -pthread -lstdc++
-LDFLAGS = 
-SHARED = -shared -rdynamic
+CORECXXFLAGS = -fPIC -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow
+LDLIBS = -lstdc++
 CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
 PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
 BASE = "$(DESTDIR)@BASE_DIR@"
 CONPATH = "$(DESTDIR)@CONFIG_DIR@"
 MODPATH = "$(DESTDIR)@MODULE_DIR@"
+DATPATH = "$(DESTDIR)@DATA_DIR@"
 BINPATH = "$(DESTDIR)@BINARY_DIR@"
+INSTALL = install
 INSTUID = @UID@
-INSTMODE_DIR = 0755
-INSTMODE_BIN = 0755
-INSTMODE_LIB = 0644
+INSTMODE_DIR = 0750
+INSTMODE_BIN = 0750
+INSTMODE_LIB = 0640
 
-@IFEQ $(CC) icc
-  CXXFLAGS += -Wshadow
-@ELSE
-  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+@IFNEQ $(COMPILER) icc
+  CORECXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute
 @ENDIF
 
+@IFNEQ $(SYSTEM) darwin
+  LDLIBS += -pthread
+@ENDIF
 
 @IFEQ $(SYSTEM) linux
   LDLIBS += -ldl -lrt
-@ELSIFEQ $(SYSTEM) solaris
-  LDLIBS += -lsocket -lnsl -lrt -lresolv
-@ELSIFEQ $(SYSTEM) sunos
+@ENDIF
+@IFEQ $(SYSTEM) gnukfreebsd
+  LDLIBS += -ldl -lrt
+@ENDIF
+@IFEQ $(SYSTEM) gnu
+  LDLIBS += -ldl -lrt
+@ENDIF
+@IFEQ $(SYSTEM) solaris
   LDLIBS += -lsocket -lnsl -lrt -lresolv
-@ELSIFEQ $(SYSTEM) darwin
-  CXXFLAGS += -DDARWIN -frtti
+  INSTALL = ginstall
+@ENDIF
+@IFEQ $(SYSTEM) darwin
   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 
+  CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+  PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+@ENDIF
 
 @IFNDEF D
   D=0
 @ENDIF
 
+DBGOK=0
 @IFEQ $(D) 0
-  CXXFLAGS += -O2 -g1
+  CORECXXFLAGS += -O2
+@IFEQ $(CXX) g++
+    CORECXXFLAGS += -g1
+@ENDIF
   HEADER = std-header
-@ELSIFEQ $(D) 1
-  CXXFLAGS += -O0 -g3 -Werror
+  DBGOK=1
+@ENDIF
+@IFEQ $(D) 1
+  CORECXXFLAGS += -O0 -g3 -Werror
   HEADER = debug-header
-@ELSIFEQ $(D) 2
-  CXXFLAGS += -O2 -g3
+  DBGOK=1
+@ENDIF
+@IFEQ $(D) 2
+  CORECXXFLAGS += -O2 -g3
   HEADER = debug-header
-@ELSE
-  HEADER = unknown-debug-level
+  DBGOK=1
 @ENDIF
 FOOTER = finishmessage
 
-CXXFLAGS += -Iinclude
-
 @GNU_ONLY MAKEFLAGS += --no-print-directory
 
 @GNU_ONLY SOURCEPATH = $(shell /bin/pwd)
 @BSD_ONLY SOURCEPATH != /bin/pwd
 
 @IFDEF V
-  RUNCC = $(CC)
+  RUNCC = $(CXX)
+  RUNLD = $(CXX)
   VERBOSE = -v
 @ELSE
   @GNU_ONLY MAKEFLAGS += --silent
   @BSD_ONLY MAKE += -s
-  RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
+  RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CXX)
+  RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CXX)
 @ENDIF
 
 @IFDEF PURE_STATIC
-  CXXFLAGS += -DPURE_STATIC
+  CORECXXFLAGS += -DPURE_STATIC
 @ENDIF
 
-@DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS PURE_STATIC
-@DO_EXPORT SOURCEPATH BUILDPATH
+# Add the users CXXFLAGS to the base ones to allow them to override
+# things like -Wfatal-errors if they wish to.
+CORECXXFLAGS += $(CXXFLAGS)
+
+@DO_EXPORT RUNCC RUNLD CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
 
 # Default target
 TARGET = all
@@ -108,6 +145,10 @@ TARGET = all
     TARGET = $(T)
 @ENDIF
 
+@IFEQ $(DBGOK) 0
+  HEADER = unknown-debug-level
+@ENDIF
+
 all: $(FOOTER)
 
 target: $(HEADER)
@@ -132,7 +173,7 @@ debug-header:
 	@echo "*************************************"
 
 mod-header:
-@IFEQ $(PURE_STATIC) 1
+@IFDEF PURE_STATIC
 	@echo 'Cannot build single modules in pure-static build'
 	@exit 1
 @ENDIF
@@ -172,19 +213,23 @@ install: target
 		echo ""; \
 		exit 1; \
 	fi
-	@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
-	@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
-	@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
-	@-install -d -m $(INSTMODE_DIR) $(BINPATH)
-	@-install -d -m $(INSTMODE_DIR) $(CONPATH)
-	@-install -d -m $(INSTMODE_DIR) $(MODPATH)
-	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
+	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
+	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
+	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
 @IFNDEF PURE_STATIC
-	[ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || install -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
+	[ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
 @ENDIF
-	-install -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
-	-install -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
-	-install -m $(INSTMODE_LIB) docs/*.example $(CONPATH)
+	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
 	@echo ""
 	@echo "*************************************"
 	@echo "*        INSTALL COMPLETE!          *"
@@ -193,9 +238,11 @@ install: target
 	@echo '  Base install:' $(BASE)
 	@echo '  Configuration:' $(CONPATH)
 	@echo '  Binaries:' $(BINPATH)
-	@echo '  Moudles:' $(MODPATH)
+	@echo '  Modules:' $(MODPATH)
+	@echo '  Data:' $(DATPATH)
 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
-	@echo 'Remember to edit your config file:' $(CONPATH)/inspircd.conf
+	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+	@echo 'Examples are available at:' $(CONPATH)/examples/
 
 @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
 @BSD_ONLY RCS_FILES = src/version.sh
@@ -212,23 +259,23 @@ clean:
 	@echo Completed.
 
 deinstall:
-	-rm $(BINPATH)/inspircd
-	-rm $(MODPATH)/*.so
-
-squeakyclean: distclean
+	-rm -f $(BINPATH)/inspircd
+	-rm -rf $(CONPATH)/examples
+	-rm -f $(MODPATH)/*.so
+	-rm -f $(BASE)/.gdbargs
+	-rm -f $(BASE)/org.inspircd.plist
 
 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_version.h
+	rm -f include/config.h
+	rm -f inspircd
+	-rm -f org.inspircd.plist
 
 distclean: clean configureclean
+	-rm -rf $(SOURCEPATH)/run
+	find $(SOURCEPATH)/src/modules -type l | xargs rm -f
 
 help:
 	@echo 'InspIRCd Makefile'
@@ -254,9 +301,8 @@ help:
 	@echo '           Multiple targets may be separated by a space'
 	@echo ''
 	@echo ' clean     Cleans object files produced by the compile'
-	@echo ' distclean Cleans all files produced by compile and ./configure'
-	@echo '           Note: this includes the Makefile'
+	@echo ' distclean Cleans all generated files (build, configure, run, etc)'
 	@echo ' deinstall Removes the files created by "make install"'
 	@echo
 
-.PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean configureclean help
+.PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall configureclean help