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/Makefile.am | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 tdeabc/Makefile.am (limited to 'tdeabc/Makefile.am') diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am new file mode 100644 index 000000000..57e72aec2 --- /dev/null +++ b/tdeabc/Makefile.am @@ -0,0 +1,72 @@ +SUBDIRS = vcard vcardparser . formats plugins scripts tests + +# Make sure $(all_includes) remains last! +INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \ + -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \ + -I$(srcdir)/vcard/include/generated \ + -I$(srcdir)/vcardparser $(all_includes) + +field.cpp: addressee.h addressee.cpp +addressee.cpp: addressee.h +addressee.cpp addressee.h field.cpp: \ + $(srcdir)/scripts/makeaddressee \ + $(srcdir)/scripts/addressee.src.cpp \ + $(srcdir)/scripts/addressee.src.h \ + $(srcdir)/scripts/entrylist \ + $(srcdir)/scripts/field.src.cpp + mysrcdir=`cd $(srcdir)/scripts && pwd` ;\ + cd scripts && $(PERL) $$mysrcdir/makeaddressee + +CLEANFILES = addressee.h addressee.cpp field.cpp + +lib_LTLIBRARIES = libkabc.la +libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined +libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ + $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) +libkabc_la_COMPILE_FIRST = addressee.h + +libkabc_la_SOURCES = \ + address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \ + distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \ + errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \ + phonenumber.cpp picture.cpp plugin.cpp resource.cpp \ + resourceselectdialog.cpp secrecy.cpp sound.cpp stdaddressbook.cpp \ + timezone.cpp vcard21parser.cpp vcardconverter.cpp vcardformat.cpp \ + vcardformatimpl.cpp vcardformatplugin.cpp ldifconverter.cpp addresslineedit.cpp \ + ldapclient.cpp addresseelist.cpp vcardtool.cpp addresseehelper.cpp \ + addresseehelper.skel lock.cpp locknull.cpp ldif.cpp ldapurl.cpp ldapconfigwidget.cpp \ + sortmode.cpp + + +kabcincludedir = $(includedir)/kabc +kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ + agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \ + errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \ + phonenumber.h picture.h plugin.h resource.h \ + resourceselectdialog.h secrecy.h sound.h stdaddressbook.h timezone.h \ + vcardconverter.h vcardformat.h vcardformatplugin.h ldifconverter.h \ + addresslineedit.h ldapclient.h addresseelist.h lock.h locknull.h ldif.h \ + ldapurl.h ldapconfigwidget.h sortmode.h + +METASOURCES = AUTO + +bin_PROGRAMS = tdeab2tdeabc + +tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la +tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp + +autostart_DATA = tdeab2tdeabc.desktop +autostartdir = $(datadir)/autostart + +manager_DATA = kabc_manager.desktop +managerdir = $(kde_servicesdir)/tderesources + +DOXYGEN_REFERENCES = tdecore tdeui + +map_DATA = countrytransl.map +mapdir = $(kde_datadir)/kabc + +EXTRA_DIST = $(map_DATA) + +include ../admin/Doxyfile.am -- 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/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdeabc/Makefile.am') diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am index 57e72aec2..afdace9a9 100644 --- a/tdeabc/Makefile.am +++ b/tdeabc/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = vcard vcardparser . formats plugins scripts tests # Make sure $(all_includes) remains last! -INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \ +INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_srcdir)/kab \ -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \ -I$(srcdir)/vcard/include/generated \ -I$(srcdir)/vcardparser $(all_includes) @@ -38,7 +38,7 @@ libkabc_la_SOURCES = \ sortmode.cpp -kabcincludedir = $(includedir)/kabc +kabcincludedir = $(includedir)/tdeabc kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \ errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \ @@ -65,7 +65,7 @@ managerdir = $(kde_servicesdir)/tderesources DOXYGEN_REFERENCES = tdecore tdeui map_DATA = countrytransl.map -mapdir = $(kde_datadir)/kabc +mapdir = $(kde_datadir)/tdeabc EXTRA_DIST = $(map_DATA) -- cgit v1.2.1 From a15448c070e58d41c8d7c6cde49d082a379f704b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 17:31:31 -0600 Subject: Fix FTBFS --- tdeabc/Makefile.am | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tdeabc/Makefile.am') diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am index afdace9a9..a1f1d1b74 100644 --- a/tdeabc/Makefile.am +++ b/tdeabc/Makefile.am @@ -19,13 +19,13 @@ addressee.cpp addressee.h field.cpp: \ CLEANFILES = addressee.h addressee.cpp field.cpp -lib_LTLIBRARIES = libkabc.la -libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined -libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ +lib_LTLIBRARIES = libtdeabc.la +libtdeabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined +libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) -libkabc_la_COMPILE_FIRST = addressee.h +libtdeabc_la_COMPILE_FIRST = addressee.h -libkabc_la_SOURCES = \ +libtdeabc_la_SOURCES = \ address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \ distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \ errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \ @@ -38,8 +38,8 @@ libkabc_la_SOURCES = \ sortmode.cpp -kabcincludedir = $(includedir)/tdeabc -kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ +tdeabcincludedir = $(includedir)/tdeabc +tdeabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \ errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \ phonenumber.h picture.h plugin.h resource.h \ @@ -53,13 +53,13 @@ METASOURCES = AUTO bin_PROGRAMS = tdeab2tdeabc tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la +tdeab2tdeabc_LDADD = libtdeabc.la ../kab/libkab.la tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp autostart_DATA = tdeab2tdeabc.desktop autostartdir = $(datadir)/autostart -manager_DATA = kabc_manager.desktop +manager_DATA = tdeabc_manager.desktop managerdir = $(kde_servicesdir)/tderesources DOXYGEN_REFERENCES = tdecore tdeui -- cgit v1.2.1