[svn-commits] qwell: trunk r381 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: qwell
Date: Thu May 10 12:48:40 2007
New Revision: 381

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

........
r380 | qwell | 2007-05-10 12:47:59 -0500 (Thu, 10 May 2007) | 5 lines

Clean up Makefile a little.

Wildcard .o files - no need to have different lines for each one.  They were all the same.
Filter out modules that are in subdirectories, when doing mkdeps - avoids a silly warning.

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu May 10 12:48:40 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?view=diff&rev=381&r1=380&r2=381
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May 10 12:48:40 2007
@@ -122,6 +122,9 @@
 		$(MAKE) -C asterisk-ooh323c clean ; \
 	fi
 
+%.o: %.c
+	$(CC) -g -c $(CFLAGS) -o $@ $<
+
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ $<
 
@@ -129,20 +132,11 @@
 include .depend
 endif
 
-cdr_addon_mysql.o: cdr_addon_mysql.c
-	$(CC) -g -c $(CFLAGS) -o $@ $<
-
 cdr_addon_mysql.so: cdr_addon_mysql.o
 	$(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
 
-res_config_mysql.o: res_config_mysql.c
-	$(CC) -g -c $(CFLAGS) -o $@ $<
-
 res_config_mysql.so: res_config_mysql.o
 	$(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
-
-app_addon_sql_mysql.o: app_addon_sql_mysql.c
-	$(CC) -g -c $(CFLAGS) -o $@ $<
 
 app_addon_sql_mysql.so: app_addon_sql_mysql.o
 	$(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
@@ -159,7 +153,7 @@
 depend: .depend
 
 .depend:
-	build_tools/mkdep $(CFLAGS) $(SELECTED_MODS:%.so=%.c)
+	build_tools/mkdep $(CFLAGS) $(filter-out format_mp3.c chan_ooh323.c,$(SELECTED_MODS:%.so=%.c))
 
 samples: 
 	mkdir -p $(DESTDIR)$(ASTETCDIR)