Correct ModDesc.

[user/henk/code/inspircd.git] / .Makefile.inc

diff --git a/.Makefile.inc b/.Makefile.inc
index f470cf0a4632dc823ddc9a7c92d958572915ecbe..f0ea08214272f9d4c1b0e65233ee7aaaf1319201 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -6,33 +6,26 @@
 #   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@
 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,22 +36,22 @@ 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.
 @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 += -I../include
 
 @GNU_ONLY MAKEFLAGS += --no-print-directory
 
@@ -68,11 +61,11 @@ NICEFLAGS += -I$(COMPILE_ROOT)/include
 @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
@@ -92,11 +85,9 @@ TARGET = all
 
 all: $(FOOTER)
 
-dep:
-       @cd src; ../make/calcdep.pl `perl -e 'print join " ", <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>'` socketengines/$(SOCKETENGINE).cpp threadengines/threadengine_pthread.cpp
-
-target: $(HEADER) dep
-       $(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk $(TARGET)
+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
@@ -143,11 +134,10 @@ finishmessage: target
 
 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)
@@ -172,7 +162,6 @@ clean:
 
 deinstall:
        -rm $(BINPATH)/inspircd
-       -rm $(LIBPATH)/*.so
        -rm $(MODPATH)/*.so
        @make/install-extras.pl deinstall
 
@@ -222,4 +211,4 @@ help:
        @echo ' deinstall Removes the files created by "make install"'
        @echo
 
-.PHONY: all dep target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean launchd_dir configureclean help
+.PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean launchd_dir configureclean help