[svn-commits] branch group/autoconf_and_menuselect r20788 - /team/group/autoconf_and_menuse...

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Apr 16 22:12:08 2006
New Revision: 20788

URL: http://svn.digium.com/view/asterisk?rev=20788&view=rev
Log:
- finish writing targets for all of the cdr modules with external dependencies
  so that they use both the LIB and INCLUDE info from configure
- always use $(...) instead of ${...} when referencing variables for the sake
  of consistency

Modified:
    team/group/autoconf_and_menuselect/cdr/Makefile

Modified: team/group/autoconf_and_menuselect/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/cdr/Makefile?rev=20788&r1=20787&r2=20788&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/cdr/Makefile (original)
+++ team/group/autoconf_and_menuselect/cdr/Makefile Sun Apr 16 22:12:08 2006
@@ -13,7 +13,7 @@
 
 MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c)))
 
-ifeq (${OSARCH},CYGWIN)
+ifeq ($(OSARCH),CYGWIN)
   CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
   CYGSOLIB=-L.. -L. -lasterisk.dll
 else
@@ -56,22 +56,31 @@
 	rm -f *.so *.o
 
 %.so : %.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB)
 
 cdr_odbc.so: cdr_odbc.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(ODBC_LIB)
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(ODBC_LIB)
+
+cdr_odbc.o: cdr_odbc.c
+	$(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $<
 
 cdr_tds.so: cdr_tds.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(TDS_LIB)
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(TDS_LIB)
+
+cdr_tds.o: cdr_tds.c
+	$(CC) -c -o $@ $(CFLAGS) $(TDS_INCLUDE) $<
+
+cdr_pgsql.so: cdr_pgsql.o
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(PGSQL_LIB)
 
 cdr_pgsql.o: cdr_pgsql.c
-	$(CC) -c -o $@ ${CFLAGS} $(PGSQL_INCLUDE) $<
-
-cdr_pgsql.so: cdr_pgsql.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(PGSQL_LIB)
+	$(CC) -c -o $@ $(CFLAGS) $(PGSQL_INCLUDE) $<
 
 cdr_sqlite.so: cdr_sqlite.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(SQLITE_LIB)
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(SQLITE_LIB)
+
+cdr_sqlite.o: cdr_sqlite.c
+	$(CC) -c -o $@ $(CFLAGS) $(SQLITE_INCLUDE) $<
 
 ifneq ($(wildcard .depend),)
   include .depend