CVS commit by gerken: Removing DOS line endings M +23 -24 Makefile.am 1.73 --- kdenonbeta/kopete/libkopete/Makefile.am #1.72:1.73 @@ -1,24 +1,23 @@ -SUBDIRS = private ui compat . - -METASOURCES = AUTO - -AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST \ - $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/ui $(all_includes) - -lib_LTLIBRARIES = libkopete.la - -libkopete_la_SOURCES = kopeteonlinestatus.cpp kopeteprotocol.cpp kopetecontact.cpp pluginloader.cpp kopeteplugin.cpp \ - kopetemessage.cpp kopetemessagemanager.cpp kopetemessagemanagerfactory.cpp kopetecontactlist.cpp kopetemetacontact.cpp \ - kopeteaway.cpp kopeteawaydialog.cpp kopetetransfermanager.cpp kopetegroup.cpp \ - kopeteaccountmanager.cpp kopeteaccount.cpp kopeteplugindataobject.cpp \ - kopetecommandhandler.cpp - -libkopete_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries) -libkopete_la_LIBADD = ui/libkopeteui.la \ - $(LIB_KOPETECOMPAT) $(LIB_KIO) $(LIB_XSS) - -servicetype_DATA = kopeteplugin.desktop kopeteprotocol.desktop -servicetypedir = $(kde_servicetypesdir) - -# vim: set noet: - +SUBDIRS = private ui compat . + +METASOURCES = AUTO + +AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST \ + $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/ui $(all_includes) + +lib_LTLIBRARIES = libkopete.la + +libkopete_la_SOURCES = kopeteonlinestatus.cpp kopeteprotocol.cpp kopetecontact.cpp pluginloader.cpp kopeteplugin.cpp \ + kopetemessage.cpp kopetemessagemanager.cpp kopetemessagemanagerfactory.cpp kopetecontactlist.cpp kopetemetacontact.cpp \ + kopeteaway.cpp kopeteawaydialog.cpp kopetetransfermanager.cpp kopetegroup.cpp \ + kopeteaccountmanager.cpp kopeteaccount.cpp kopeteplugindataobject.cpp \ + kopetecommandhandler.cpp + +libkopete_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries) +libkopete_la_LIBADD = ui/libkopeteui.la \ + $(LIB_KOPETECOMPAT) $(LIB_KIO) $(LIB_XSS) + +servicetype_DATA = kopeteplugin.desktop kopeteprotocol.desktop +servicetypedir = $(kde_servicetypesdir) + +# vim: set noet: