From 572cdf85ea43c6670055fb7a2f35d97555b6a17f Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Tue, 1 Sep 2009 15:05:50 +0000
Subject: Move compiler flag selection from configure to Makefile; add support
 for Intel C++ Compiler.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11564 e03df62e-2008-0410-955e-edbf42e46eb7
---
 make/bsd-real.mk |  9 ++-------
 make/gnu-real.mk | 10 ++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'make')

diff --git a/make/bsd-real.mk b/make/bsd-real.mk
index 8ae9bfe99..12211e7cb 100644
--- a/make/bsd-real.mk
+++ b/make/bsd-real.mk
@@ -1,11 +1,9 @@
-CORE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <*.cpp>'
-MODE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <modes/*.cpp>'
+CORE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <*.cpp>, <modes/*.cpp>'
 CMD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <commands/*.cpp>'
 MOD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <modules/*.cpp>'
 SPANNINGTREE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <modules/m_spanningtree/*.cpp>'
 
-CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
-CORE_TARGS += socketengines/$(SOCKETENGINE).o
+CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o
 MOD_TARGS += modules/m_spanningtree.so
 
 DFILES != perl -e 'print join " ", grep s!([^/]+)\.cpp!.$$1.d!, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_spanningtree/*.cpp>'
@@ -17,9 +15,6 @@ commands: $(CMD_TARGS)
 
 modules: $(MOD_TARGS)
 
-modeclasses.a: $(MODE_TARGS)
-	@../make/run-cc.pl ar crs modeclasses.a $(MODE_TARGS)
-
 modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
 	$(RUNCC) $(FLAGS) -shared -export-dynamic -o $@ $(SPANNINGTREE_TARGS)
 
diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index 489e1bbdf..f6d86eb00 100644
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -4,8 +4,9 @@ CMD_TARGS = $(patsubst %.cpp,%.so,$(wildcard commands/*.cpp))
 MOD_TARGS = $(patsubst %.cpp,%.so,$(wildcard modules/*.cpp))
 SPANNINGTREE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modules/m_spanningtree/*.cpp))
 
-CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
+CORE_TARGS += threadengines/threadengine_pthread.o
 CORE_TARGS += socketengines/$(SOCKETENGINE).o
+CORE_TARGS += $(MODE_TARGS)
 MOD_TARGS += modules/m_spanningtree.so
 
 DFILES = $(shell perl -e 'print join " ", grep s!([^/]+)\.cpp!.$$1.d!, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_spanningtree/*.cpp>')
@@ -17,14 +18,11 @@ commands: $(CMD_TARGS)
 
 modules: $(MOD_TARGS)
 
-modeclasses.a: $(MODE_TARGS)
-	@../make/run-cc.pl ar crs modeclasses.a $(MODE_TARGS)
-
 modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
-	$(RUNCC) $(FLAGS) -shared -export-dynamic -o $@ $(SPANNINGTREE_TARGS)
+	$(RUNCC) $(FLAGS) $(PICLDFLAGS) -o $@ $(SPANNINGTREE_TARGS)
 
 inspircd: $(CORE_TARGS)
-	$(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS)
+	$(RUNCC) $(FLAGS) $(CORE_FLAGS) -o $@ $(LDLIBS) $(CORE_TARGS)
 
 .%.d: %.cpp
 	@../make/calcdep.pl $<
-- 
cgit v1.2.3