Author: sayer
Date: 2008-12-09 19:23:20 +0100 (Tue, 09 Dec 2008)
New Revision: 1196

Added:
   trunk/apps/dsm/mods/Makefile.dsm_module
Modified:
   trunk/apps/dsm/mods/mod_dlg/Makefile
   trunk/apps/dsm/mods/mod_sys/Makefile
   trunk/apps/dsm/mods/mod_uri/Makefile
Log:
added copy of Makefile.app_module with differing install target,
to overcome build warnings


Added: trunk/apps/dsm/mods/Makefile.dsm_module
===================================================================
--- trunk/apps/dsm/mods/Makefile.dsm_module     2008-12-09 10:59:20 UTC (rev 
1195)
+++ trunk/apps/dsm/mods/Makefile.dsm_module     2008-12-09 18:23:20 UTC (rev 
1196)
@@ -0,0 +1,117 @@
+COREPATH ?=../../../core
+.DEFAULT_GOAL := all
+
+include $(COREPATH)/../Makefile.defs
+
+LIB_LDFLAGS  += $(module_ldflags)
+CPPFLAGS += -I $(COREPATH)
+CFLAGS   += -I $(COREPATH)
+CFLAGS   += $(module_cflags)
+CPPFLAGS += $(module_cflags)
+CXXFLAGS += $(module_cflags)
+
+app_module_dir = $(COREPATH)/lib
+
+lib_name = $(plug_in_name).so
+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)
+objs     = $(srcs:.cpp=.o) 
+depends  = $(srcs:.cpp=.d)
+
+.PHONY: all
+all: $(extra_target)
+       [EMAIL PROTECTED](MAKE) deps    && \
+         $(MAKE) $(lib_full_name)
+
+.PHONY: module_package
+module_package: $(extra_target)
+       [EMAIL PROTECTED](MAKE) deps    && \
+         $(MAKE) $(lib_name)
+
+
+.PHONY: clean
+clean: $(extra_clean)
+       [EMAIL PROTECTED] -f $(objs) $(depends) $(lib_name)
+
+.PHONY: deps
+deps: $(depends) $(extra_depends)
+
+.PHONY: install
+install: all $(extra_install)
+       mkdir -p $(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm
+       if [ -f "$(lib_name)" ]; then \
+        $(INSTALL-TOUCH) $(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
+        $(INSTALL-MODULES) $(lib_name) 
$(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
+       fi
+
+.PHONY: install-cfg
+install-cfg: 
+       mkdir -p $(DESTDIR)$(cfg-target)etc
+       [EMAIL PROTECTED] r in $(module_conf_files); do \
+                       echo installing $$r ;  \
+                       $(INSTALL-TOUCH) $(DESTDIR)$(cfg-target)$$r ; \
+                       sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \
+                       -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \
+                       -e "s#/usr/.*lib/sems/ivr/#$(lib-target)ivr/#g" \
+                       -e "s#/usr/.*lib/sems/dsm/#$(lib-target)dsm/#g" \
+                       -e "s#/usr/.*lib/sems/py_sems/#$(lib-target)py_sems/#g" 
\
+                       -e "s#/usr/.*etc/sems#$(cfg-target)#g" \
+                       < $$r > $(DESTDIR)$(cfg-target)$$r; \
+       done
+
+$(DESTDIR)(audio-prefix)/$(audio-dir):
+       mkdir -p $(DESTDIR)$(audio-prefix)/$(audio-dir)
+
+.PHONY: $(plug_in_name)_audio
+$(plug_in_name)_audio: $(DESTDIR)$(audio-prefix)/$(audio-dir)
+       mkdir -p $(DESTDIR)$(audio-prefix)/$(audio-dir)$(plug_in_name)
+       [EMAIL PROTECTED] f in $(AUDIO_FILES) ; do \
+               if [ -n "wav/$$f" ]; then \
+                       $(INSTALL-TOUCH) 
$(DESTDIR)$(audio-prefix)/$(audio-dir)$(plug_in_name)/$$f; \
+                       $(INSTALL-AUDIO) wav/$$f 
$(DESTDIR)$(audio-prefix)/$(audio-dir)$(plug_in_name)/$$f; \
+               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) > $@
+
+%.d: %.c Makefile $(COREPATH)/plug-in/Makefile.app_module 
$(COREPATH)/../Makefile.defs
+       $(CC) -MM $< $(CFLAGS) $(CPPFLAGS) > $@
+
+%.o: %.cpp %.d $(COREPATH)/../Makefile.defs
+       $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
+
+%.o: %.c %.d $(COREPATH)/../Makefile.defs
+       $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+
+$(lib_full_name): $(lib_name)
+       cp $(lib_name) $(lib_full_name)
+
+$(lib_name): $(objs) $(module_extra_objs) Makefile
+       $(LD) -o $(lib_name) $(objs) $(module_extra_objs) $(LIB_LDFLAGS)
+
+ifeq ($(lib_full_name),$(MAKECMDGOALS))
+include $(depends)
+endif
+
+ifeq (,$(MAKECMDGOALS))
+include $(depends)
+endif

Modified: trunk/apps/dsm/mods/mod_dlg/Makefile
===================================================================
--- trunk/apps/dsm/mods/mod_dlg/Makefile        2008-12-09 10:59:20 UTC (rev 
1195)
+++ trunk/apps/dsm/mods/mod_dlg/Makefile        2008-12-09 18:23:20 UTC (rev 
1196)
@@ -7,12 +7,4 @@
 
 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) $(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
-        $(INSTALL-MODULES) $(lib_name) 
$(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
-       fi
+include $(DSMPATH)/mods/Makefile.dsm_module

Modified: trunk/apps/dsm/mods/mod_sys/Makefile
===================================================================
--- trunk/apps/dsm/mods/mod_sys/Makefile        2008-12-09 10:59:20 UTC (rev 
1195)
+++ trunk/apps/dsm/mods/mod_sys/Makefile        2008-12-09 18:23:20 UTC (rev 
1196)
@@ -7,12 +7,4 @@
 
 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) $(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
-        $(INSTALL-MODULES) $(lib_name) 
$(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
-       fi
+include $(DSMPATH)/mods/Makefile.dsm_module

Modified: trunk/apps/dsm/mods/mod_uri/Makefile
===================================================================
--- trunk/apps/dsm/mods/mod_uri/Makefile        2008-12-09 10:59:20 UTC (rev 
1195)
+++ trunk/apps/dsm/mods/mod_uri/Makefile        2008-12-09 18:23:20 UTC (rev 
1196)
@@ -7,12 +7,4 @@
 
 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) $(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
-        $(INSTALL-MODULES) $(lib_name) 
$(DESTDIR)$(lib-prefix)/$(lib-dir)/dsm/; \
-       fi
+include $(DSMPATH)/mods/Makefile.dsm_module

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to