[asterisk-addons-commits] kpfleming: trunk r473 - in /trunk: ./ Makefile Makefile.rules build_tools/mkdep

[SVN commits to the Asterisk addons project]

Author: kpfleming
Date: Fri Oct 19 09:45:09 2007
New Revision: 473

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=473
Log:
Merged revisions 472 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r472 | kpfleming | 2007-10-19 09:41:27 -0500 (Fri, 19 Oct 2007) | 2 lines

use more of the standard Asterisk build system here...

........

Removed:
    trunk/build_tools/mkdep
Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/Makefile.rules

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Oct 19 09:45:09 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414,417,423,428,466
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414,417,423,428,466,472

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?view=diff&rev=473&r1=472&r2=473
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Oct 19 09:45:09 2007
@@ -13,17 +13,17 @@
 
 .EXPORT_ALL_VARIABLES:
 
-.PHONY: all install depend samples clean update distclean dist-clean menuselect chan_ooh323.so format_mp3.so
+.PHONY: all install samples clean update distclean menuselect chan_ooh323.so format_mp3.so
 
 # Overwite config files on "make samples"
 OVERWRITE:=y
 
-CFLAGS+=-fPIC
+ASTCFLAGS+=-fPIC
 
 #NOISY_BUILD=yes
 
 ifeq ($(AST_DEVMODE),yes)
-  CFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
+  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
 endif
 
 # If the file .asteriskaddons.makeopts is present in your home directory, you can
@@ -82,10 +82,10 @@
 all: config.status menuselect.makeopts 
 	@$(MAKE) _all
 
-_all: depend $(SELECTED_MODS)
+_all: $(SELECTED_MODS)
 
 config.status: configure
-	@CFLAGS="" ./configure
+	@./configure
 	@echo "****"
 	@echo "**** The configure script was just executed, so 'make' needs to be"
 	@echo "**** restarted."
@@ -110,8 +110,6 @@
 	@echo " +               $(MAKE) samples                    +"
 	@echo " +-----------------------------------------------+"
 
-#dist-clean: distclean
-
 distclean: clean
 	@$(MAKE) -C menuselect distclean
 	@if [ -f asterisk-ooh323c/Makefile ] ; then \
@@ -130,17 +128,11 @@
 		$(MAKE) -C asterisk-ooh323c clean ; \
 	fi
 
-%.o: %.c
-	$(CC) -g -c $(CFLAGS) -o $@ $<
-
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
-
-ifneq ($(wildcard .depend),)
-include .depend
+ifneq ($(wildcard .*.d),)
+   include .*.d
 endif
 
-CFLAGS+=$(ASTERISK_INCLUDE)
+ASTCFLAGS+=$(ASTERISK_INCLUDE)
 
 cdr_addon_mysql.so: cdr_addon_mysql.o
 	$(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
@@ -161,12 +153,7 @@
 	@$(MAKE) -C asterisk-ooh323c
 
 format_mp3.so:
-	@INCLUDE="$(CFLAGS)" $(MAKE) -C format_mp3 all CC="$(CC)"
-
-depend: .depend
-
-.depend:
-	build_tools/mkdep $(CFLAGS) $(filter-out format_mp3.c chan_ooh323.c,$(SELECTED_MODS:%.so=%.c))
+	@INCLUDE="$(ASTCFLAGS)" $(MAKE) -C format_mp3 all CC="$(CC)"
 
 samples: 
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -203,7 +190,6 @@
 	- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
 
 menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status
-	@CFLAGS="" $(MAKE) -C menuselect
+	@$(MAKE) -C menuselect
 
 include Makefile.rules
-

Modified: trunk/Makefile.rules
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile.rules?view=diff&rev=473&r1=472&r2=473
==============================================================================
--- trunk/Makefile.rules (original)
+++ trunk/Makefile.rules Fri Oct 19 09:45:09 2007
@@ -40,43 +40,23 @@
 
 %.o: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
 
 %.o: %.i
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
 
 %.i: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
 
 %.o: %.s
 	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
 
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
 	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
-endif
 
 %.c: %.y
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"