put mods in subdirs

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

Makefile.am

@@ -115,7 +115,8 @@ modules: $(NAME)
 modclean:
 	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
 
-
+modwipe:
+	rm -f $(PREFIX)/mod/*.so
 
 install_mod: modules
 	@echo Installing $(NAME)
@@ -123,7 +124,7 @@ install_mod: modules
 	@/bin/cp -p ./$(NAME) $(PREFIX)/bin
 	@ln -sf $(PREFIX)/bin/$(NAME) /usr/bin
 	@echo Installing Modules
-	@/bin/cp -f src/mod/*/mod_*.so $(PREFIX)/mod >/dev/null 2<&1 || echo No modules to copy.
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i install || exit 1; done
 	@echo done
 
 dox:

Makefile.in

@@ -978,13 +978,16 @@ modules: $(NAME)
 modclean:
 	@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
 
+modwipe:
+	rm -f $(PREFIX)/mod/*.so
+
 install_mod: modules
 	@echo Installing $(NAME)
 	@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
 	@/bin/cp -p ./$(NAME) $(PREFIX)/bin
 	@ln -sf $(PREFIX)/bin/$(NAME) /usr/bin
 	@echo Installing Modules
-	@/bin/cp -f src/mod/*/mod_*.so $(PREFIX)/mod >/dev/null 2<&1 || echo No modules to copy.
+	@cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; PREFIX=$(PREFIX) MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i install || exit 1; done
 	@echo done
 
 dox:

generic_mod.mk

@@ -1,9 +1,11 @@
-all:	$(MOD).so
+all:	$(MODNAME).so
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

modmake.sh

@@ -18,7 +18,6 @@ fi
 if [ -f $mod/Makefile ] ; then
     MODNAME=$end $make -C $mod $@
 else 
-    echo "XX $make -f $pwd/generic_mod.mk -C $mod $@"
-    MODNAME=$end $make -f $pwd/generic_mod.mk -C $end $@
+    MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@
 fi
 

modules.conf

@@ -1,20 +1,19 @@
-# list the modules to build
-mod_bridgecall
-mod_dialplan_demo
-mod_softtimer
-mod_woomerachan
-mod_playback
-#mod_wanchan
-mod_speexcodec
-mod_exosip
-mod_g711codec
-mod_rawaudio
-mod_iaxchan
-#mod_opalchan
-#mod_codec_g729
-mod_event_test
-#mod_portaudio
-mod_xmpp_event
-mod_sndfile
-codec/mod_codec_gsm
-
+applications/mod_bridgecall
+applications/mod_playback
+#applications/mod_skel
+codecs/mod_codec_g729
+codecs/mod_codec_gsm
+codecs/mod_g711codec
+codecs/mod_rawaudio
+codecs/mod_speexcodec
+dialplans/mod_dialplan_demo
+endpoints/mod_exosip
+endpoints/mod_iaxchan
+#endpoints/mod_opalchan
+endpoints/mod_portaudio
+#endpoints/mod_wanchan
+endpoints/mod_woomerachan
+#event_handlers/mod_event_test
+event_handlers/mod_xmpp_event
+formats/mod_sndfile
+timers/mod_softtimer

src/mod/codecs/mod_codec_g729/Makefile

@@ -1,12 +1,14 @@
 CFLAGS += -I/usr/local/include/libg729
 LDFLAGS +=-lg729
 
-all:	$(MOD).so
+all:	$(MODNAME).so
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS) -lspeex
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/codecs/mod_codec_gsm/Makefile

@@ -12,3 +12,5 @@ $(MODNAME).so: $(MODNAME).c
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/codecs/mod_g711codec/Makefile

@@ -1,15 +1,18 @@
 
-all:	$(MOD).so
+all:	$(MODNAME).so
 
 g711.o: g711.c g711.h
 	$(CC) -c -O2 -pthread -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE g711.c -o g711.o
 
-$(MOD).so: $(MOD).c g711.o
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) $(SOLINK) g711.o $(MOD).o -o $(MOD).so $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c g711.o
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
+	$(CC) $(SOLINK) g711.o $(MODNAME).o -o $(MODNAME).so $(LDFLAGS)
 
 
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod
+

src/mod/codecs/mod_speexcodec/Makefile

@@ -1,12 +1,14 @@
-all:	depends $(MOD).so
+all:	depends $(MODNAME).so
 
 depends:
 	$(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
-	$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
+	$(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).so $(LDFLAGS) -lspeex
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/endpoints/mod_exosip/Makefile

@@ -7,7 +7,7 @@ else
 	LINKER=$(CC)
 endif
 
-all:	depends $(MOD).so
+all:	depends $(MODNAME).so
 
 depends:
 	$(BASE)/buildlib.sh $(BASE) install jthread-1.1.2.tar.gz --prefix=$(PREFIX)
@@ -17,10 +17,12 @@ depends:
 	$(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
 
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(LINKER) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
+	$(LINKER) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/endpoints/mod_iaxchan/Makefile

@@ -1,15 +1,17 @@
 LDFLAGS += -liax -L/usr/local/lib
 
-all:	depends $(MOD).so
+all:	depends $(MODNAME).so
 
 depends:
 	$(BASE)/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
+	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/endpoints/mod_opalchan/Makefile

@@ -1,12 +1,14 @@
 #CFLAGS += -I/usr/src/common/src
 LDFLAGS += -liax
 
-all:	$(MOD).so
+all:	$(MODNAME).so
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
+	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/endpoints/mod_portaudio/Makefile

@@ -1,19 +1,21 @@
 LDFLAGS += -lportaudio -L/usr/local/lib
 MYOBJS = pablio.o ringbuffer.o
 
-all:	depends $(MOD).so
+all:	depends $(MODNAME).so
 
 depends:
 	$(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
 %.o:  %.c
 	$(CC) -fPIC $(CFLAGS) -c -o $@ $<
 
-$(MOD).so: $(MOD).c $(MYOBJS)
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) $(SOLINK) -o $(MOD).so $(MOD).o $(MYOBJS) $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c $(MYOBJS)
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
+	$(CC) $(SOLINK) -o $(MODNAME).so $(MODNAME).o $(MYOBJS) $(LDFLAGS)
 
 
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/event_handlers/mod_xmpp_event/Makefile

@@ -1,14 +1,16 @@
 LDFLAGS += -liksemel -L/usr/local/lib
 
-all:	depends $(MOD).so
+all:	depends $(MODNAME).so
 
 depends:
 	$(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
+	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod

src/mod/formats/mod_sndfile/Makefile

@@ -1,15 +1,19 @@
 LDFLAGS += -lsndfile -L/usr/local/lib
 
-all:	depends $(MOD).so
+all:	depends $(MODNAME).so
 
 depends:
 	$(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
 
-$(MOD).so: $(MOD).c
-	$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-	$(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
+$(MODNAME).so: $(MODNAME).c
+	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
+	$(CC) $(SOLINK) -o $(MODNAME).so  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
 	rm -fr *.so *.o *~
 
+install:
+	cp -f $(MODNAME).so $(PREFIX)/mod
+
+