X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=b2eaa4abe5ae3420f2a9ac2c914f81ea5ae9116d;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=e8bf232b9fc194b451bf81ca3d156ee2e04596e7;hpb=ee0d8addcea381775c98dc1e40031a0d658636b6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/.Makefile.inc b/.Makefile.inc index e8bf232b9..b2eaa4abe 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -11,21 +11,15 @@ @BSD_ONLY MAKESTYLE = bsd @BSD_ONLY COMPILE_ROOT != pwd -@IFDEF D - NICEFLAGS = @DEVELOPER@ - HEADER = debug-header -@ENDIF - -NICEFLAGS ?= @FLAGS@ -HEADER ?= std-header - -NICEFLAGS += -I$(COMPILE_ROOT)/include - CC = @CC@ -FLAGS = $(NICEFLAGS) -pedantic -PICLDFLAGS = -fPIC -DPIC -shared -export-dynamic -CORE_FLAGS = @CORE_FLAGS@ -LDLIBS = @LDLIBS@ +SYSTEM = @SYSTEM@ +SOCKETENGINE = @SOCKETENGINE@ +CXXFLAGS += -pipe -fPIC -DPIC +LDLIBS = -pthread -lstdc++ +LDFLAGS = +SHARED = -shared -rdynamic +CORELDFLAGS = -rdynamic -L. $(LDFLAGS) +PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS) BASE = "@BASE_DIR@" CONPATH = "@CONFIG_DIR@" MODPATH = "@MODULE_DIR@" @@ -33,7 +27,38 @@ BINPATH = "@BINARY_DIR@" LAUNCHDPATH = "/System/Library/LaunchDaemons" LIBPATH = "@LIBRARY_DIR@" INSTMODE = 0755 -SOCKETENGINE = @SOCKETENGINE@ + +@IFEQ $(CC) icc + CXXFLAGS += -Wshadow +@ELSE + CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall +@ENDIF + + +@IFEQ $(SYSTEM) linux + LDLIBS += -ldl +@ELSIFEQ $(SYSTEM) solaris + LDLIBS += -lsocket -lnsl -lrt -lresolv +@ELSIFEQ $(SYSTEM) sunos + LDLIBS += -lsocket -lnsl -lrt -lresolv +@ELSIFEQ $(SYSTEM) darwin + CXXFLAGS += -DDARWIN -frtti + LDLIBS += -ldl + SHARED = -bundle -twolevel_namespace -undefined dynamic_lookup + CORE_FLAGS = -dynamic -bind_at_load -L. +@ENDIF + +@IFDEF D + CXXFLAGS += -g3 + HEADER = debug-header +@ELSE + CXXFLAGS += -g1 + HEADER = std-header +@ENDIF +FOOTER = finishmessage + +CXXFLAGS += -I$(COMPILE_ROOT)/include + @GNU_ONLY MAKEFLAGS += --no-print-directory @IFDEF V @@ -45,23 +70,29 @@ SOCKETENGINE = @SOCKETENGINE@ RUNCC = $(COMPILE_ROOT)/make/run-cc.pl $(CC) @ENDIF -@DO_EXPORT RUNCC FLAGS NICEFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORE_FLAGS +@DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS +@DO_EXPORT BASE CONPATH MODPATH BINPATH LIBPATH # Default target +TARGET = all @IFDEF M - _all: module + HEADER = mod-header + FOOTER = mod-footer + @BSD_ONLY TARGET = modules/${M:S/.so$//}.so + @GNU_ONLY TARGET = modules/$(M:.so=).so @ENDIF -all: finishmessage +@IFDEF T + HEADER = + FOOTER = target + TARGET = $(T) +@ENDIF -alldep: $(HEADER) - @echo -n "Generating module dependencies..." - @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk alldep - @echo 'done' +all: $(FOOTER) -allreal: alldep - @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk all +target: $(HEADER) + $(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk $(TARGET) debug: @${MAKE} D=1 all @@ -80,6 +111,13 @@ debug-header: @echo "* *" @echo "*************************************" +mod-header: + @echo 'Building single module:' + +mod-footer: target + @echo 'To install, copy src/$(TARGET) to $(MODPATH)' + @echo 'Or, run "make install"' + std-header: @echo "*************************************" @echo "* BUILDING INSPIRCD *" @@ -90,7 +128,7 @@ std-header: @echo "* while you wait for make to run? *" @echo "*************************************" -finishmessage: allreal +finishmessage: target @echo "" @echo "*************************************" @echo "* BUILD COMPLETE! *" @@ -99,7 +137,7 @@ finishmessage: allreal @echo "* make install *" @echo "*************************************" -install: allreal@EXTRA_DIR@ +install: target@EXTRA_DIR@ @-install -d -m $(INSTMODE) $(BASE) @-install -d -m $(INSTMODE) $(LIBPATH) @-install -d -m $(INSTMODE) $(BINPATH) @@ -108,7 +146,8 @@ install: allreal@EXTRA_DIR@ -install -m $(INSTMODE) src/commands/*.so $(LIBPATH) -install -m $(INSTMODE) src/modules/*.so $(MODPATH) -install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null -@INSTALL_LIST@ -install -m $(INSTMODE) src/inspircd $(BINPATH) + -install -m $(INSTMODE) src/inspircd $(BINPATH) + @$(MAKEENV) make/install-extras.pl install @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" @@ -119,28 +158,19 @@ install: allreal@EXTRA_DIR@ @echo "* REMEMBER TO EDIT YOUR CONFIG FILE *" @echo "*************************************" -module: - @BSD_ONLY @${MAKE} -C src/modules $(MAKEARGS) ${M:S/.so$//}.so - @GNU_ONLY @${MAKE} -C src/modules $(MAKEARGS) $(M:.so=).so - clean: @echo Cleaning... @rm -f src/inspircd src/modes/modeclasses.a @rm -f src/*.so src/modules/*.so src/commands/*.so src/modules/*/*.so @rm -f src/*.o src/*/*.o src/modules/*/*.o + @rm -f src/.*.d src/*/.*.d src/modules/*/.*.d @echo Completed. -modclean: - rm -f src/modules/*.so - rm -f src/modules/*.o - rm -f src/modules/*/*.so - rm -f src/modules/*/*.o - deinstall: -rm $(BINPATH)/inspircd -rm $(LIBPATH)/*.so -rm $(MODPATH)/*.so -@UNINSTALL_LIST@ + @make/install-extras.pl deinstall squeakyclean: distclean @@ -158,7 +188,7 @@ configureclean: rm -f include/inspircd_config.h rm -f include/inspircd_se_config.h -distclean: modclean clean configureclean +distclean: clean configureclean help: @echo 'InspIRCd Makefile' @@ -175,12 +205,17 @@ help: @echo ' install Build and install InspIRCd to the directory chosen in ./configure' @echo ' Currently installs to ${BASE}' @echo ' debug Compile a debug build. Equivalent to "make D=1 all"' - @echo ' module Builds a single module, which is specified by "M=m_modname"' - @echo ' The command "make M=m_modname" is a shortcut for this target' + @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 commands modules' + @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 ' deinstall Removes the files created by "make install"' @echo -.PHONY: all help debug debug-header std-header ircd mods finishmessage install module clean modclean deinstall squeakyclean launchd_dir configureclean +.PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean launchd_dir configureclean help