From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:21 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kabc/plugins/net/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kabc/plugins/net/Makefile.am') diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am index f4183d442..ca0ece015 100644 --- a/kabc/plugins/net/Makefile.am +++ b/kabc/plugins/net/Makefile.am @@ -22,7 +22,7 @@ messages: rc.cpp kabcincludedir = $(includedir)/kabc kabcinclude_HEADERS = resourcenet.h -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = net.desktop resourcenetplugin.lo: ../../addressee.h -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kabc/plugins/net/Makefile.am | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 kabc/plugins/net/Makefile.am (limited to 'kabc/plugins/net/Makefile.am') diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am deleted file mode 100644 index ca0ece015..000000000 --- a/kabc/plugins/net/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) - -# these are the headers for your project -noinst_HEADERS = resourcenetconfig.h - -lib_LTLIBRARIES = libkabc_net.la -libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp -libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_net_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO) -libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h - -kde_module_LTLIBRARIES = kabc_net.la -kabc_net_la_SOURCES = resourcenetplugin.cpp -kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore -kabc_net_la_LIBADD = libkabc_net.la - -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kabc_net.pot - -kabcincludedir = $(includedir)/kabc -kabcinclude_HEADERS = resourcenet.h - -servicedir = $(kde_servicesdir)/tderesources/kabc -service_DATA = net.desktop - -resourcenetplugin.lo: ../../addressee.h -- cgit v1.2.1