linux build system fixups

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9829 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_managed/Makefile b/src/mod/languages/mod_managed/Makefile
index f69d4f9af3eccb2974895be0c36ead82aecbf752..de012f25db3de41b63b457426805e771af34c5f0 100644 (file)
--- a/src/mod/languages/mod_managed/Makefile
+++ b/src/mod/languages/mod_managed/Makefile
@@ -1,10 +1,9 @@
-#MOD_CFLAGS=`pkg-config --cflags --libs mono`\r
 MOD_CFLAGS=-D_REENTRANT -pthread -I/opt/mono-1.9/lib/pkgconfig/../../include/mono-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lmono\r
-#LDFLAGS=`pkg-config --libs mono`\r
 BASE=../../../..\r
 VERBOSE=1\r
 include $(BASE)/build/modmake.rules\r
 LOCAL_OBJS=freeswitch_managed.o freeswitch_wrap.o\r
+\r
 local_depend: $(LOCAL_OBJS)\r
 \r
 freeswitch_managed.o: freeswitch_managed.h freeswitch_managed.cpp\r
@@ -16,6 +15,19 @@ freeswitch_wrap.cpp: freeswitch_wrap.cxx
 \r
 reswig: swigclean freeswitch_wrap.cxx\r
 \r
+local_depend:\r
+       cd managed && $(MAKE)\r
+\r
+local_install: $(MODINSTDIR)/mod_managed.so \r
+       cd managed && $(MAKE) MODINSTDIR=$(MODINSTDIR) install\r
+\r
+local_uninstall:\r
+       rm -fr $(MODINSTDIR)/mod_managed.so\r
+       cd managed && $(MAKE) MODINSTDIR=$(MODINSTDIR) uninstall\r
+\r
+local_clean:\r
+       cd managed && $(MAKE) clean\r
+\r
 swigclean: clean\r
        rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs\r
 \r
@@ -24,3 +36,6 @@ freeswitch_wrap.cxx:
        rm -f ./managed/swig.cs\r
        cat *.cs > ./managed/swig.cs\r
        rm -f *.cs\r
+\r
+depend_install:\r
+       mkdir -p $(DESTDIR)$(PREFIX)/mod/managed\r

diff --git a/src/mod/languages/mod_managed/managed/Makefile b/src/mod/languages/mod_managed/managed/Makefile
index 0d7e9d11352e374f5914664709788672b2055d74..a368f5aaa53f52c7e96fd6afa7f36c48be251b6a 100644 (file)
--- a/src/mod/languages/mod_managed/managed/Makefile
+++ b/src/mod/languages/mod_managed/managed/Makefile
@@ -1,13 +1,14 @@
-all: Debug Debug/mod_managed_lib.dll\r
+all: mod_managed_lib.dll\r
 \r
 clean:\r
-       rm -fr Debug\r
+       rm -fr mod_managed_lib.dll\r
 \r
-Debug:\r
-       mkdir Debug\r
+mod_managed_lib.dll: Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs\r
+       gmcs -target:library -out:mod_managed_lib.dll -d:DEBUG Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs\r
 \r
-Debug/mod_managed_lib.dll: Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs\r
-       gmcs -target:library -out:Debug/mod_managed_lib.dll -d:DEBUG Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs\r
+install: mod_managed_lib.dll\r
+       install mod_managed_lib.dll $(MODINSTDIR)\r
+\r
+uninstall:\r
+       rm -f $(MODINSTDIR)/mod_managed_lib.dll\r
 \r
-install: Debug/mod_managed_lib.dll\r
-       install Debug/mod_managed_lib.dll /usr/local/freeswitch/mod\r

diff --git a/src/mod/languages/mod_managed/runswig.sh b/src/mod/languages/mod_managed/runswig.sh
deleted file mode 100644 (file)
index b6fc48a..0000000
--- a/src/mod/languages/mod_managed/runswig.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash\r
-swig -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed freeswitch.i\r
-rm -f ./managed/swig.cs\r
-cat *.cs > ./managed/swig.cs\r
-rm -f *.cs\r