[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kcall/applet
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2005-07-03 16:59:10
Message-ID: 1120409950.131867.17586.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 431236 by eva:

rename libaudio to libkcallaudio in order to prevent name conflicts


 M  +4 -4      audio/Makefile.am  
 M  +1 -1      kcall/Makefile.am  


--- trunk/kdenonbeta/kcall/applet/audio/Makefile.am #431235:431236
@@ -1,11 +1,11 @@
 INCLUDES = -I../kcallsipsettings $(all_includes)
 METASOURCES = AUTO
 
-lib_LTLIBRARIES = libaudio.la
-libaudio_la_LDFLAGS = $(all_libraries)
-libaudio_la_SOURCES = audiobuffer.cpp audiobuffer.h callaudio.cpp callaudio.h\
+lib_LTLIBRARIES = libkcallaudio.la
+libkcallaudio_la_LDFLAGS = $(all_libraries)
+libkcallaudio_la_SOURCES = audiobuffer.cpp audiobuffer.h callaudio.cpp callaudio.h\
 	dspaudio.cpp dspaudio.h dspaudioin.cpp dspaudioin.h dspaudioout.cpp\
 	dspaudioout.h dspout.cpp dspout.h dspoutoss.cpp dspoutoss.h\
 	dspoutrtp.cpp dspoutrtp.h dtmfgenerator.cpp dtmfgenerator.h g711.cpp\
 	g711.h kphoneconst.h rtpdataheader.h
-libaudio_la_LIBADD = ../gsm/libgsm.la ../ilbc/libilbc.la
+libkcallaudio_la_LIBADD = ../gsm/libgsm.la ../ilbc/libilbc.la
--- trunk/kdenonbeta/kcall/applet/kcall/Makefile.am #431235:431236
@@ -26,7 +26,7 @@
 	ksipauthentication.cpp incomingdialog.ui kcallcore.skel dialdialog.ui 
 kcallapplet_LDFLAGS = -avoid-version $(KDE_RPATH) $(all_libraries)
 kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la ../ilbc/libilbc.la ../gsm/libgsm.la \
-	../dissipate2/libdissipate2.la ../audio/libaudio.la $(LIB_DCOP) $(LIB_KIO) $(LIB_ARTS) \
+	../dissipate2/libdissipate2.la ../audio/libkcallaudio.la $(LIB_DCOP) $(LIB_KIO) $(LIB_ARTS) \
 	$(LIB_KDEUI)
 
 # this is where the desktop file will go 
[prev in list] [next in list] [prev in thread] [next in thread]