diff options
author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-01 15:05:50 +0000 |
---|---|---|
committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-01 15:05:50 +0000 |
commit | 572cdf85ea43c6670055fb7a2f35d97555b6a17f (patch) | |
tree | bb7ab0b1aa3623bdded389bb198cc120c661a1d4 /make/bsd-real.mk | |
parent | 8db36081940e85a02c71d0b51c6d2107ceffd3b4 (diff) |
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
Diffstat (limited to 'make/bsd-real.mk')
-rw-r--r-- | make/bsd-real.mk | 9 |
1 files changed, 2 insertions, 7 deletions
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) |