Author: sayer
Date: 2008-07-15 20:09:13 +0200 (Tue, 15 Jul 2008)
New Revision: 1042
Modified:
trunk/Makefile.defs
trunk/apps/dsm/DSM.cpp
trunk/apps/dsm/Makefile
trunk/apps/dsm/etc/dsm.conf
trunk/apps/dsm/mods/Makefile
trunk/apps/dsm/mods/mod_sys/Makefile
trunk/core/plug-in/Makefile.app_module
Log:
o install $(plug_in_name)_lib if wanted
o install dsm mods to dsm lib directory
Modified: trunk/Makefile.defs
===================================================================
--- trunk/Makefile.defs 2008-07-15 17:36:37 UTC (rev 1041)
+++ trunk/Makefile.defs 2008-07-15 18:09:13 UTC (rev 1042)
@@ -172,6 +172,7 @@
modules-prefix = $(basedir)$(prefix)
doc-prefix = $(basedir)$(prefix)
audio-prefix = $(basedir)$(prefix)
+lib-prefix = $(basedir)$(prefix)
# dirs
cfg-dir = etc/sems/
@@ -237,7 +238,7 @@
export CXX CC LD
export DESTDIR PREFIX prefix basedir ser-prefix
export start-script
-export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix
+export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix lib-prefix
export cfg-dir bin-dir modules-dir audio-dir lib-dir ser-cfg-dir doc-dir
man-dir
export bin-target cfg-target modules-target audio-target ser-cfg-target
lib-target
export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES
INSTALL-DOC INSTALL-AUDIO
Modified: trunk/apps/dsm/DSM.cpp
===================================================================
--- trunk/apps/dsm/DSM.cpp 2008-07-15 17:36:37 UTC (rev 1041)
+++ trunk/apps/dsm/DSM.cpp 2008-07-15 18:09:13 UTC (rev 1042)
@@ -36,6 +36,8 @@
#include <fstream>
+#define MOD_NAME "dsm"
+
// session creator export
extern "C" void* session_factory_create() {
return DSMFactory::instance();
Modified: trunk/apps/dsm/Makefile
===================================================================
--- trunk/apps/dsm/Makefile 2008-07-15 17:36:37 UTC (rev 1041)
+++ trunk/apps/dsm/Makefile 2008-07-15 18:09:13 UTC (rev 1042)
@@ -1,9 +1,21 @@
plug_in_name = dsm
module_ldflags =
-module_cflags = -DMOD_NAME=\"$(plug_in_name)\"
+module_cflags =
+#-DMOD_NAME=\"$(plug_in_name)\"
-extra_install = $(plug_in_name)_audio
+extra_target = make_dsm_mods
+extra_install = $(plug_in_name)_lib install_dsm_mods
+extra_clean = clean_dsm_mods
COREPATH ?=../../core
include $(COREPATH)/plug-in/Makefile.app_module
+
+make_dsm_mods:
+ [EMAIL PROTECTED](MAKE) -C mods
+
+install_dsm_mods:
+ [EMAIL PROTECTED](MAKE) -C mods/ install
+
+clean_dsm_mods:
+ [EMAIL PROTECTED](MAKE) -C mods/ clean
Modified: trunk/apps/dsm/etc/dsm.conf
===================================================================
--- trunk/apps/dsm/etc/dsm.conf 2008-07-15 17:36:37 UTC (rev 1041)
+++ trunk/apps/dsm/etc/dsm.conf 2008-07-15 18:09:13 UTC (rev 1042)
@@ -1,10 +1,10 @@
# diagrams (DSM descriptions)
-diag_path=/usr/local/lib/sems/lib
+diag_path=/usr/local/lib/sems/dsm
load_diags=inbound_call,outbound_call
# for import(mod_name)
-mod_path=/usr/local/lib/sems/lib
+mod_path=/usr/local/lib/sems/dsm
# DSM to start for in/outbound call
inbound_start_diag=inbound_call
Modified: trunk/apps/dsm/mods/Makefile
===================================================================
--- trunk/apps/dsm/mods/Makefile 2008-07-15 17:36:37 UTC (rev 1041)
+++ trunk/apps/dsm/mods/Makefile 2008-07-15 18:09:13 UTC (rev 1042)
@@ -6,7 +6,7 @@
exclude_modules ?=
modules ?= $(filter-out $(subst ;, ,$(exclude_modules))\
- $(wildcard Makefile*), \
+ $(wildcard Makefile*) lib, \
$(wildcard *) )
@@ -15,7 +15,7 @@
.PHONY: clean
clean:
- [EMAIL PROTECTED] -f *.so
+ [EMAIL PROTECTED] -f lib/*.so
[EMAIL PROTECTED] r in $(modules) "" ; do \
if [ -n "$$r" ]; then \
echo "" ; \
Modified: trunk/apps/dsm/mods/mod_sys/Makefile
===================================================================
--- trunk/apps/dsm/mods/mod_sys/Makefile 2008-07-15 17:36:37 UTC (rev
1041)
+++ trunk/apps/dsm/mods/mod_sys/Makefile 2008-07-15 18:09:13 UTC (rev
1042)
@@ -6,4 +6,13 @@
module_cflags = -DMOD_NAME=\"$(plug_in_name)\" -I$(DSMPATH)
COREPATH ?=$(DSMPATH)/../../core
+lib_full_name = $(DSMPATH)/mods/lib/$(lib_name)
include $(COREPATH)/plug-in/Makefile.app_module
+
+.PHONY: install
+install: all $(extra_install)
+ mkdir -p $(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm
+ if [ -f "$(lib_name)" ]; then \
+ $(INSTALL-TOUCH) $(lib-prefix)/$(lib-dir)/dsm/; \
+ $(INSTALL-MODULES) $(lib_name) $(lib-prefix)/$(lib-dir)/dsm/; \
+ fi
Modified: trunk/core/plug-in/Makefile.app_module
===================================================================
--- trunk/core/plug-in/Makefile.app_module 2008-07-15 17:36:37 UTC (rev
1041)
+++ trunk/core/plug-in/Makefile.app_module 2008-07-15 18:09:13 UTC (rev
1042)
@@ -13,10 +13,12 @@
app_module_dir = $(COREPATH)/lib
lib_name = $(plug_in_name).so
-lib_full_name = $(app_module_dir)/$(lib_name)
+lib_full_name ?= $(app_module_dir)/$(lib_name)
module_conf_files = $(wildcard etc/*.conf)
AUDIO_FILES=$(notdir $(wildcard wav/*.wav))
+EXTRA_LIB_DIR?=lib/
+EXTRA_LIB_FILES=$(notdir $(wildcard $(EXTRA_LIB_DIR)*))
srcs = $(wildcard *.cpp)
hrds = $(wildcard *.h)
@@ -76,6 +78,15 @@
fi ; \
done
+.PHONY: $(plug_in_name)_lib
+$(plug_in_name)_lib:
+ mkdir -p $(DESTDIR)$(lib-prefix)/$(lib-dir)/$(plug_in_name)
+ [EMAIL PROTECTED] f in $(EXTRA_LIB_FILES) ; do \
+ if [ -n "$(EXTRA_LIB_DIR)/$$f" ]; then \
+ $(INSTALL-TOUCH)
$(DESTDIR)$(lib-prefix)/$(lib-dir)/$(plug_in_name)/$$f; \
+ $(INSTALL-AUDIO) $(EXTRA_LIB_DIR)$$f
$(DESTDIR)$(lib-prefix)/$(lib-dir)/$(plug_in_name)/$$f; \
+ fi ; \
+ done
%.d: %.cpp Makefile $(COREPATH)/plug-in/Makefile.app_module
$(COREPATH)/../Makefile.defs
$(CXX) -MM $< $(CXXFLAGS) $(CPPFLAGS) > $@
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
