X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=f0ea08214272f9d4c1b0e65233ee7aaaf1319201;hb=0b878f54cfce452b6829ab00950f6d062cec0f10;hp=feb8ed99b2761b67b3a5520df374dd5d516c53fd;hpb=77f2c57c6072220c7ded7d40c4ef82ea4756fb3e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/.Makefile.inc b/.Makefile.inc index feb8ed99b..f0ea08214 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -6,34 +6,53 @@ # 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 - -@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@" 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../include + @GNU_ONLY MAKEFLAGS += --no-print-directory @IFDEF V @@ -42,33 +61,33 @@ SOCKETENGINE = @SOCKETENGINE@ @ELSE @GNU_ONLY MAKEFLAGS += --silent @BSD_ONLY MAKE += -s - RUNCC = $(COMPILE_ROOT)/make/run-cc.pl $(CC) + RUNCC = ../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 # 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: $(HEADER) - @echo -n "Generating module dependencies..." - @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk alldep - @echo 'done' +@IFDEF T + HEADER = + FOOTER = target + TARGET = $(T) +@ENDIF -allreal: 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) +@GNU_ONLY $(MAKEENV) $(MAKE) -C src -f ../make/gnu-real.mk $(TARGET) +@BSD_ONLY $(MAKEENV) $(MAKE) -C src -f ../make/bsd-real.mk $(TARGET) debug: @${MAKE} D=1 all @@ -87,6 +106,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 *" @@ -97,7 +123,7 @@ std-header: @echo "* while you wait for make to run? *" @echo "*************************************" -finishmessage: allreal +finishmessage: target @echo "" @echo "*************************************" @echo "* BUILD COMPLETE! *" @@ -106,13 +132,12 @@ 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/commands/*.so $(MODPATH) -install -m $(INSTMODE) src/modules/*.so $(MODPATH) -install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null -install -m $(INSTMODE) src/inspircd $(BINPATH) @@ -135,15 +160,8 @@ clean: @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 @make/install-extras.pl deinstall @@ -163,7 +181,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' @@ -180,12 +198,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