[Freeswitch-branches] [commit] r4146 - freeswitch/branches/cparker/src/mod/event_handlers/mod_cdr

[Freeswitch SVN]

Author: cparker
Date: Wed Feb  7 11:47:11 2007
New Revision: 4146

Modified:
   freeswitch/branches/cparker/src/mod/event_handlers/mod_cdr/Makefile

Log:
Fix merge conflicts in Makefile

Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_cdr/Makefile
==============================================================================
--- freeswitch/branches/cparker/src/mod/event_handlers/mod_cdr/Makefile	(original)
+++ freeswitch/branches/cparker/src/mod/event_handlers/mod_cdr/Makefile	Wed Feb  7 11:47:11 2007
@@ -1,16 +1,8 @@
-<<<<<<< .mine
-
-=======
->>>>>>> .r4141
 #CFLAGS  += -DSWITCH_QUEUE_ENHANCED
-<<<<<<< .mine
-=======
 #LDFLAGS += -lcurl
->>>>>>> .r4141
 CPPCC = g++
 OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o
 
-<<<<<<< .mine
 # uncomment to build radiuscdr
 OBJS += radiuscdr.o
 LDFLAGS += -lfreeradius-client
@@ -20,16 +12,12 @@
 #CFLAGS  += $(shell mysql_config --include) 
 #LDFLAGS += $(shell mysql_config --libs)
 
-#
-
-=======
 ifneq ($(shell which mysql_config),)
   CFLAGS  += $(shell mysql_config --include)
   LDFLAGS += $(shell mysql_config --libs)
   OBJS    += mysqlcdr.o
 endif
 
->>>>>>> .r4141
 all:	depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends: