X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make%2Ftemplate%2Fmain.mk;h=d82e8b27e37ce43f074ee3cfb79f628e6c86d0d8;hb=ba7431b4fd6c62dd04d252e769e825769accb2a9;hp=3d7b8a6947114c1836325d339f114b1447f26bb8;hpb=f960a97cc6b509c756a20d892609825c67c2fc43;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/template/main.mk b/make/template/main.mk
index 3d7b8a694..d82e8b27e 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -30,30 +30,37 @@
 #
 
 
-CC = @CC@
+CXX = @CXX@
+COMPILER = @COMPILER@
 SYSTEM = @SYSTEM@
 BUILDPATH = @BUILD_DIR@
 SOCKETENGINE = @SOCKETENGINE@
-CXXFLAGS = -pipe -fPIC -DPIC
-LDLIBS = -pthread -lstdc++
-LDFLAGS = 
+CORECXXFLAGS = -fPIC -fvisibility-inlines-hidden -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)-$(COMPILER) darwin-gcc
+  CORECXXFLAGS += -fvisibility=hidden
 @ENDIF
 
+@IFNEQ $(SYSTEM) darwin
+  LDLIBS += -pthread
+@ENDIF
 
 @IFEQ $(SYSTEM) linux
   LDLIBS += -ldl -lrt
@@ -66,19 +73,13 @@ INSTMODE_LIB = 0644
 @ENDIF
 @IFEQ $(SYSTEM) solaris
   LDLIBS += -lsocket -lnsl -lrt -lresolv
-@ENDIF
-@IFEQ $(SYSTEM) sunos
-  LDLIBS += -lsocket -lnsl -lrt -lresolv
+  INSTALL = ginstall
 @ENDIF
 @IFEQ $(SYSTEM) darwin
-  CXXFLAGS += -DDARWIN -frtti
   LDLIBS += -ldl
   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
 @ENDIF
-@IFEQ $(SYSTEM) interix
-  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
-@ENDIF
 
 @IFNDEF D
   D=0
@@ -86,45 +87,50 @@ INSTMODE_LIB = 0644
 
 DBGOK=0
 @IFEQ $(D) 0
-  CXXFLAGS += -O2 -g1
+  CORECXXFLAGS += -O2
+@IFEQ $(CXX) g++
+    CORECXXFLAGS += -g1
+@ENDIF
   HEADER = std-header
   DBGOK=1
 @ENDIF
 @IFEQ $(D) 1
-  CXXFLAGS += -O0 -g3 -Werror
+  CORECXXFLAGS += -O0 -g3 -Werror
   HEADER = debug-header
   DBGOK=1
 @ENDIF
 @IFEQ $(D) 2
-  CXXFLAGS += -O2 -g3
+  CORECXXFLAGS += -O2 -g3
   HEADER = debug-header
   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)
-  RUNLD = $(CC)
+  RUNCC = $(CXX)
+  RUNLD = $(CXX)
   VERBOSE = -v
 @ELSE
   @GNU_ONLY MAKEFLAGS += --silent
   @BSD_ONLY MAKE += -s
-  RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
-  RUNLD = 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 RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+# 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
@@ -211,22 +217,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)/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)
+	@-$(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/conf/*.example $(CONPATH)/examples
-	-install -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
-	-install -m $(INSTMODE_LIB) docs/conf/modules/*.conf.* $(CONPATH)/examples/modules
+	-$(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!          *"
@@ -236,6 +243,7 @@ install: target
 	@echo '  Configuration:' $(CONPATH)
 	@echo '  Binaries:' $(BINPATH)
 	@echo '  Modules:' $(MODPATH)
+	@echo '  Data:' $(DATPATH)
 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
 	@echo 'Examples are available at:' $(CONPATH)/examples/
@@ -255,23 +263,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'
@@ -297,9 +305,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