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 --- tdeabc/plugins/net/Makefile.am | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tdeabc/plugins/net/Makefile.am (limited to 'tdeabc/plugins/net/Makefile.am') diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am new file mode 100644 index 000000000..c2ded1b44 --- /dev/null +++ b/tdeabc/plugins/net/Makefile.am @@ -0,0 +1,28 @@ +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)/tdeabc/libkabc.la $(LIB_KIO) +libkabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/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 From a6cec4c38c48127d90ca7d0eda0d5e558b93cafa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 01:10:13 -0600 Subject: Fix build system references to kabc --- tdeabc/plugins/net/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdeabc/plugins/net/Makefile.am') diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am index c2ded1b44..ea921ccbd 100644 --- a/tdeabc/plugins/net/Makefile.am +++ b/tdeabc/plugins/net/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcenetconfig.h @@ -17,12 +17,12 @@ kabc_net_la_LIBADD = libkabc_net.la METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kabc_net.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeabc_net.pot -kabcincludedir = $(includedir)/kabc +kabcincludedir = $(includedir)/tdeabc kabcinclude_HEADERS = resourcenet.h -servicedir = $(kde_servicesdir)/tderesources/kabc +servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = net.desktop resourcenetplugin.lo: ../../addressee.h -- cgit v1.2.1 From 5fbaba69567fec6978b2587fc1cd4fe66a9e6f80 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 17:55:55 -0600 Subject: Rename additional kabc files --- tdeabc/plugins/net/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tdeabc/plugins/net/Makefile.am') diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am index ea921ccbd..8fd53f34f 100644 --- a/tdeabc/plugins/net/Makefile.am +++ b/tdeabc/plugins/net/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(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)/tdeabc/libkabc.la $(LIB_KIO) -libkabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/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 +lib_LTLIBRARIES = libtdeabc_net.la +libtdeabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp +libtdeabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_net_la_LIBADD = $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO) +libtdeabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + +kde_module_LTLIBRARIES = tdeabc_net.la +tdeabc_net_la_SOURCES = resourcenetplugin.cpp +tdeabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore +tdeabc_net_la_LIBADD = libtdeabc_net.la METASOURCES = AUTO -- cgit v1.2.1