X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=c801dd0685fecc38250a87d56027420c19e198ce;hb=18aae91d9336b204ac252ad83008bfd0e78595e4;hp=00cb9c2ecc51bc48bf812b714318fca74215f8b6;hpb=572cdf85ea43c6670055fb7a2f35d97555b6a17f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/.Makefile.inc b/.Makefile.inc index 00cb9c2ec..c801dd068 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -6,33 +6,27 @@ # Please do not edit unless you know what you're doing. # -@GNU_ONLY MAKESTYLE = gnu -@GNU_ONLY COMPILE_ROOT ?= $(shell pwd) -@BSD_ONLY MAKESTYLE = bsd -@BSD_ONLY COMPILE_ROOT != pwd - CC = @CC@ SYSTEM = @SYSTEM@ +BUILDPATH = @BUILD_DIR@ SOCKETENGINE = @SOCKETENGINE@ -NICEFLAGS = -pipe -fPIC +CXXFLAGS += -pipe -fPIC -DPIC LDLIBS = -pthread -lstdc++ +LDFLAGS = SHARED = -shared -rdynamic -CORE_FLAGS = -rdynamic -L. -PICLDFLAGS = -fPIC -DPIC -shared -rdynamic +CORELDFLAGS = -rdynamic -L. $(LDFLAGS) +PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS) BASE = "@BASE_DIR@" CONPATH = "@CONFIG_DIR@" MODPATH = "@MODULE_DIR@" BINPATH = "@BINARY_DIR@" LAUNCHDPATH = "/System/Library/LaunchDaemons" -LIBPATH = "@LIBRARY_DIR@" INSTMODE = 0755 @IFEQ $(CC) icc - NICEFLAGS += -Wshadow - FLAGS = $(NICEFLAGS) + CXXFLAGS += -Wshadow @ELSE - NICEFLAGS += -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall - FLAGS = $(NICEFLAGS) -pedantic + CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall @ENDIF @@ -43,55 +37,63 @@ INSTMODE = 0755 @ELSIFEQ $(SYSTEM) sunos LDLIBS += -lsocket -lnsl -lrt -lresolv @ELSIFEQ $(SYSTEM) darwin - NICEFLAGS += -DDARWIN -frtti + CXXFLAGS += -DDARWIN -frtti LDLIBS += -ldl SHARED = -bundle -twolevel_namespace -undefined dynamic_lookup - CORE_FLAGS = -dynamic -bind_at_load -L. + CORELDFLAGS = -dynamic -bind_at_load -L. +@ELSIFEQ $(SYSTEM) interix + CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include @ENDIF @IFDEF D - NICEFLAGS += -g3 + CXXFLAGS += -g3 HEADER = debug-header @ELSE - NICEFLAGS += -g1 + CXXFLAGS += -g1 HEADER = std-header @ENDIF +FOOTER = finishmessage -NICEFLAGS += -I$(COMPILE_ROOT)/include +CXXFLAGS += -Iinclude @GNU_ONLY MAKEFLAGS += --no-print-directory +@GNU_ONLY SOURCEPATH = $(shell /bin/pwd) +@BSD_ONLY SOURCEPATH != /bin/pwd + @IFDEF V RUNCC = $(CC) VERBOSE = -v @ELSE @GNU_ONLY MAKEFLAGS += --silent @BSD_ONLY MAKE += -s - RUNCC = $(COMPILE_ROOT)/make/run-cc.pl $(CC) + RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC) @ENDIF -@DO_EXPORT RUNCC FLAGS NICEFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORE_FLAGS -@DO_EXPORT BASE CONPATH MODPATH BINPATH LIBPATH +@DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS +@DO_EXPORT BASE CONPATH MODPATH BINPATH SOURCEPATH BUILDPATH # Default target +TARGET = all @IFDEF M - _all: module - @BSD_ONLY MODNAME = ${M:S/.so$//} - @GNU_ONLY MODNAME = $(M:.so=) + HEADER = mod-header + FOOTER = mod-footer + @BSD_ONLY TARGET = modules/${M:S/.so$//}.so + @GNU_ONLY TARGET = modules/$(M:.so=).so @ENDIF -all: finishmessage - -alldep: - @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk alldep +@IFDEF T + HEADER = + FOOTER = target + TARGET = $(T) +@ENDIF -allreal: $(HEADER) alldep - @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk all +all: $(FOOTER) -module: - @cd src; ../make/calcdep.pl modules/$(MODNAME).cpp - @$(MAKEENV) $(MAKE) -C src -f modules/.$(MODNAME).d modules/$(MODNAME).so +target: $(HEADER) + $(MAKEENV) perl make/calcdep.pl + $(MAKEENV) $(MAKE) -C $(BUILDPATH) -f real.mk $(TARGET) debug: @${MAKE} D=1 all @@ -110,6 +112,13 @@ debug-header: @echo "* *" @echo "*************************************" +mod-header: + @echo 'Building single module:' + +mod-footer: target + @echo 'To install, copy $(BUILDPATH)/$(TARGET) to $(MODPATH)' + @echo 'Or, run "make install"' + std-header: @echo "*************************************" @echo "* BUILDING INSPIRCD *" @@ -120,7 +129,7 @@ std-header: @echo "* while you wait for make to run? *" @echo "*************************************" -finishmessage: allreal +finishmessage: target @echo "" @echo "*************************************" @echo "* BUILD COMPLETE! *" @@ -129,16 +138,14 @@ 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) @-install -d -m $(INSTMODE) $(CONPATH) @-install -d -m $(INSTMODE) $(MODPATH) - -install -m $(INSTMODE) src/commands/*.so $(LIBPATH) - -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 "*************************************" @@ -150,23 +157,24 @@ install: allreal@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/commands/*.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. -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 @make/install-extras.pl deinstall @@ -184,9 +192,9 @@ configureclean: 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: modclean clean configureclean +distclean: clean configureclean help: @echo 'InspIRCd Makefile' @@ -203,12 +211,16 @@ 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 (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' @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