X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Fmain.mk;h=818b4139d8681a7fbab038f6fa75fd12a83878de;hb=b9e11915a976daaf790ebc763aff56e19fd49e0f;hp=521888beadedae4bbaad4dbeadceaeefcb52a016;hpb=8f13eddcd3f23a2c47e88e176f2e5032f8227450;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/template/main.mk b/make/template/main.mk index 521888bea..818b4139d 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -37,7 +37,7 @@ COMPILER = @COMPILER_NAME@ SYSTEM = @SYSTEM_NAME@ BUILDPATH ?= $(PWD)/build SOCKETENGINE = @SOCKETENGINE@ -CORECXXFLAGS = -fPIC -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow +CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow LDLIBS = -lstdc++ CORELDFLAGS = -rdynamic -L. $(LDFLAGS) PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS) @@ -45,6 +45,7 @@ BASE = "$(DESTDIR)@BASE_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" MANPATH = "$(DESTDIR)@MANUAL_DIR@" MODPATH = "$(DESTDIR)@MODULE_DIR@" +LOGPATH = "$(DESTDIR)@LOG_DIR@" DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" INSTALL = install @@ -60,10 +61,6 @@ INSTMODE_LIB = 0640 @ENDIF @ENDIF -@IFNEQ $(SYSTEM)-$(COMPILER) darwin-GCC - CORECXXFLAGS += -fvisibility=hidden -@ENDIF - @IFNEQ $(SYSTEM) darwin LDLIBS += -pthread @ENDIF @@ -87,26 +84,26 @@ INSTMODE_LIB = 0640 PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS) @ENDIF -@IFNDEF D - D=0 +@IFNDEF INSPIRCD_DEBUG + INSPIRCD_DEBUG=0 @ENDIF DBGOK=0 -@IFEQ $(D) 0 - CORECXXFLAGS += -O2 +@IFEQ $(INSPIRCD_DEBUG) 0 + CORECXXFLAGS += -fno-rtti -O2 @IFEQ $(COMPILER) GCC CORECXXFLAGS += -g1 @ENDIF HEADER = std-header DBGOK=1 @ENDIF -@IFEQ $(D) 1 - CORECXXFLAGS += -O0 -g3 -Werror +@IFEQ $(INSPIRCD_DEBUG) 1 + CORECXXFLAGS += -O0 -g3 -Werror -DINSPIRCD_ENABLE_RTTI HEADER = debug-header DBGOK=1 @ENDIF -@IFEQ $(D) 2 - CORECXXFLAGS += -O2 -g3 +@IFEQ $(INSPIRCD_DEBUG) 2 + CORECXXFLAGS += -fno-rtti -O2 -g3 HEADER = debug-header DBGOK=1 @ENDIF @@ -117,42 +114,36 @@ FOOTER = finishmessage @TARGET GNU_MAKE SOURCEPATH = $(shell /bin/pwd) @TARGET BSD_MAKE SOURCEPATH != /bin/pwd -@IFDEF V - RUNCC = $(CXX) - RUNLD = $(CXX) - VERBOSE = -v -@ELSE +@IFNDEF INSPIRCD_VERBOSE @TARGET GNU_MAKE MAKEFLAGS += --silent @TARGET BSD_MAKE MAKE += -s - RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CXX) - RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CXX) @ENDIF -@IFDEF PURE_STATIC - CORECXXFLAGS += -DPURE_STATIC +@IFDEF INSPIRCD_STATIC + CORECXXFLAGS += -DINSPIRCD_STATIC @ENDIF # 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 +@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS INSPIRCD_VERBOSE SOCKETENGINE CORELDFLAGS +@DO_EXPORT SOURCEPATH BUILDPATH INSPIRCD_STATIC # Default target TARGET = all -@IFDEF M +@IFDEF INSPIRCD_MODULE HEADER = mod-header FOOTER = mod-footer - @TARGET BSD_MAKE TARGET = modules/${M:S/.so$//}.so - @TARGET GNU_MAKE TARGET = modules/$(M:.so=).so + @TARGET BSD_MAKE TARGET = modules/${INSPIRCD_MODULE:S/.so$//}.so + @TARGET GNU_MAKE TARGET = modules/$(INSPIRCD_MODULE:.so=).so @ENDIF -@IFDEF T +@IFDEF INSPIRCD_TARGET HEADER = FOOTER = target - TARGET = $(T) + TARGET = $(INSPIRCD_TARGET) @ENDIF @IFEQ $(DBGOK) 0 @@ -163,10 +154,10 @@ all: $(FOOTER) target: $(HEADER) $(MAKEENV) perl make/calcdep.pl - cd $(BUILDPATH); $(MAKEENV) $(MAKE) -f real.mk $(TARGET) + cd "$(BUILDPATH)"; $(MAKEENV) $(MAKE) -f real.mk $(TARGET) debug: - @${MAKE} D=1 all + @${MAKE} INSPIRCD_DEBUG=1 all debug-header: @echo "*************************************" @@ -183,7 +174,7 @@ debug-header: @echo "*************************************" mod-header: -@IFDEF PURE_STATIC +@IFDEF INSPIRCD_STATIC @echo 'Cannot build single modules in pure-static build' @exit 1 @ENDIF @@ -224,27 +215,27 @@ install: target 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 -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH) + @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH) @-$(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) $(MANPATH) @-$(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)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) +@IFNDEF INSPIRCD_STATIC + [ "$(BUILDPATH)/modules/" -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so $(MODPATH) @ENDIF - -$(INSTALL) -m $(INSTMODE_BIN) inspircd $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(BASE) 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(BASE)/.gdbargs 2>/dev/null @IFEQ $(SYSTEM) darwin - -$(INSTALL) -m $(INSTMODE_BIN) org.inspircd.plist $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(BASE) 2>/dev/null @ENDIF @IFEQ $(SYSTEM) linux - -$(INSTALL) -m $(INSTMODE_LIB) inspircd.service $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.service $(BASE) 2>/dev/null @ENDIF - -$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null @@ -270,10 +261,10 @@ GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure @CONFIGU clean: @echo Cleaning... - -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 + -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: @@ -281,25 +272,22 @@ deinstall: -rm -rf $(CONPATH)/examples -rm -f $(MANPATH)/inspircd.1 -rm -f $(MANPATH)/inspircd-genssl.1 - -rm -f $(MODPATH)/*.so + -rm -f $(MODPATH)/m_*.so + -rm -f $(MODPATH)/core_*.so -rm -f $(BASE)/.gdbargs -rm -f $(BASE)/inspircd.service -rm -f $(BASE)/org.inspircd.plist configureclean: + rm -f .gdbargs rm -f BSDmakefile rm -f GNUmakefile rm -f include/config.h - rm -f inspircd - rm -f inspircd.1 - rm -f inspircd-genssl.1 - -rm -f inspircd.service - -rm -f org.inspircd.plist - -rm -f @CONFIGURE_CACHE_FILE@ + rm -rf @CONFIGURE_DIRECTORY@ distclean: clean configureclean - -rm -rf $(SOURCEPATH)/run - find $(SOURCEPATH)/src/modules -type l | xargs rm -f + -rm -rf "$(SOURCEPATH)/run" + find "$(SOURCEPATH)/src/modules" -type l | xargs rm -f help: @echo 'InspIRCd Makefile' @@ -307,11 +295,11 @@ help: @echo 'Use: ${MAKE} [flags] [targets]' @echo '' @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 ' D=2 Enable debug build with optimizations, for detailed backtraces' - @echo ' DESTDIR= Specify a destination root directory (for tarball creation)' - @echo ' -j Run a parallel build using N jobs' + @echo ' INSPIRCD_VERBOSE=1 Show the full command being executed instead of "BUILD: dns.cpp"' + @echo ' INSPIRCD_DEBUG=1 Enable debug build, for module development or crash tracing' + @echo ' INSPIRCD_DEBUG=2 Enable debug build with optimizations, for detailed backtraces' + @echo ' DESTDIR= Specify a destination root directory (for tarball creation)' + @echo ' -j Run a parallel build using N jobs' @echo '' @echo 'Targets:' @echo ' all Complete build of InspIRCd, without installing (default)' @@ -319,14 +307,16 @@ 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 (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 ' INSPIRCD_MODULE=m_foo Builds a single module (core_foo also works here)' + @echo ' INSPIRCD_TARGET=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' @echo ' distclean Cleans all generated files (build, configure, run, etc)' @echo ' deinstall Removes the files created by "make install"' @echo +.NOTPARALLEL: + .PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall configureclean help