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/file/Makefile.am | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tdeabc/plugins/file/Makefile.am (limited to 'tdeabc/plugins/file/Makefile.am') diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am new file mode 100644 index 000000000..d00ffea3f --- /dev/null +++ b/tdeabc/plugins/file/Makefile.am @@ -0,0 +1,28 @@ +INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes) + +# these are the headers for your project +noinst_HEADERS = resourcefileconfig.h + +lib_LTLIBRARIES = libkabc_file.la +libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp +libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + + +kde_module_LTLIBRARIES = kabc_file.la +kabc_file_la_SOURCES = resourcefileplugin.cpp +kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined +kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE) +kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kabc_file.pot + +kabcincludedir = $(includedir)/kabc +kabcinclude_HEADERS = resourcefile.h + +servicedir = $(kde_servicesdir)/tderesources/kabc +service_DATA = file.desktop -- 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/file/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdeabc/plugins/file/Makefile.am') diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am index d00ffea3f..bf85d8bd6 100644 --- a/tdeabc/plugins/file/Makefile.am +++ b/tdeabc/plugins/file/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes) +INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcefileconfig.h @@ -19,10 +19,10 @@ kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kabc_file.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeabc_file.pot -kabcincludedir = $(includedir)/kabc +kabcincludedir = $(includedir)/tdeabc kabcinclude_HEADERS = resourcefile.h -servicedir = $(kde_servicesdir)/tderesources/kabc +servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = file.desktop -- 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/file/Makefile.am | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tdeabc/plugins/file/Makefile.am') diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am index bf85d8bd6..2df682794 100644 --- a/tdeabc/plugins/file/Makefile.am +++ b/tdeabc/plugins/file/Makefile.am @@ -3,18 +3,18 @@ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcefileconfig.h -lib_LTLIBRARIES = libkabc_file.la -libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp -libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) -libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h - - -kde_module_LTLIBRARIES = kabc_file.la -kabc_file_la_SOURCES = resourcefileplugin.cpp -kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE) -kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h +lib_LTLIBRARIES = libtdeabc_file.la +libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp +libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + + +kde_module_LTLIBRARIES = tdeabc_file.la +tdeabc_file_la_SOURCES = resourcefileplugin.cpp +tdeabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined +tdeabc_file_la_LIBADD = libtdeabc_file.la $(LIB_QT) $(LIB_TDECORE) +tdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h METASOURCES = AUTO -- cgit v1.2.1 From 45f3927b0ffec2599bc0e1ce361c5386474a85f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:26:45 -0600 Subject: Rename KABC namespace --- tdeabc/plugins/file/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeabc/plugins/file/Makefile.am') diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am index 2df682794..475fcd4dc 100644 --- a/tdeabc/plugins/file/Makefile.am +++ b/tdeabc/plugins/file/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourcefileconfig.h lib_LTLIBRARIES = libtdeabc_file.la libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libtdeabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libtdeabc_file_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h -- cgit v1.2.1