From b363d2579af0a11b77e698aed2e1021c2233b644 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:50 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- wizards/Makefile.am | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'wizards/Makefile.am') diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 3447f4ea7..5faa267ae 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -1,12 +1,12 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \ - -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \ + -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) \ -I$(top_srcdir)/knotes \ -I$(top_srcdir)/certmanager/lib \ - -I$(top_builddir)/kresources/groupwise \ - -I$(top_builddir)/kresources/lib \ - -I$(top_srcdir)/kresources/lib \ + -I$(top_builddir)/tderesources/groupwise \ + -I$(top_builddir)/tderesources/lib \ + -I$(top_srcdir)/tderesources/lib \ $(all_includes) bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \ @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \ libscalixwizard.la -groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \ libkolabwizard.la \ libexchangewizard.la \ @@ -28,9 +28,9 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp # Kolab libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la \ - $(top_builddir)/kresources/kolab/kabc/libkabckolab.la \ - $(top_builddir)/kresources/kolab/knotes/libknoteskolab.la \ +libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \ + $(top_builddir)/tderesources/kolab/kabc/libkabckolab.la \ + $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la @@ -39,65 +39,65 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \ kolabkmailchanges.cpp kolabwizard_LDADD = libkolabwizard.la $(LIB_TDEUI) -kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kolabwizard_SOURCES = kolabmain.cpp # eGroupware libegroupwarewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libegroupwarewizard_la_SOURCES = egroupwarewizard.cpp egroupwareconfig.kcfgc -libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xmlrpc.la \ - $(top_builddir)/kresources/egroupware/libkcal_xmlrpc.la \ - $(top_builddir)/kresources/egroupware/libknotes_xmlrpc.la \ +libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libkabc_xmlrpc.la \ + $(top_builddir)/tderesources/egroupware/libkcal_xmlrpc.la \ + $(top_builddir)/tderesources/egroupware/libknotes_xmlrpc.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(LIB_TDEUI) egroupwarewizard_LDADD = libegroupwarewizard.la -egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor egroupwarewizard_SOURCES = egroupwaremain.cpp # SLOX libsloxwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsloxwizard_la_SOURCES = sloxwizard.cpp sloxconfig.kcfgc -libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \ - $(top_builddir)/kresources/slox/libkabc_slox.la \ +libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \ + $(top_builddir)/tderesources/slox/libkabc_slox.la \ $(top_builddir)/libtdepim/libtdepim.la sloxwizard_LDADD = libsloxwizard.la -sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor sloxwizard_SOURCES = sloxmain.cpp # GroupWise libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ kmailchanges.cpp -libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \ - $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \ +libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_groupwise.la \ + $(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la -libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \ - $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h +libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/kabc_groupwiseprefs.h \ + $(top_builddir)/tderesources/groupwise/kcal_groupwiseprefsbase.h groupwisewizard_LDADD = libgroupwisewizard.la -groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor groupwisewizard_SOURCES = groupwisemain.cpp # Exchange libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libexchangewizard_la_SOURCES = exchangewizard.cpp -libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_newexchange.la \ - $(top_builddir)/kresources/newexchange/libkabc_newexchange.la \ +libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_newexchange.la \ + $(top_builddir)/tderesources/newexchange/libkabc_newexchange.la \ $(top_builddir)/libtdepim/libtdepim.la exchangewizard_LDADD = libexchangewizard.la -exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor exchangewizard_SOURCES = exchangemain.cpp # Scalix libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \ - $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \ +libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \ + $(top_builddir)/tderesources/scalix/kabc/libkabcscalix.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la @@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg scalixkmailchanges.cpp scalixwizard_LDADD = libscalixwizard.la $(LIB_TDEUI) -scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor scalixwizard_SOURCES = scalixmain.cpp noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ @@ -117,8 +117,8 @@ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot -egroupwarewizard.lo: ../kresources/egroupware/kabc_egroupwareprefs.h ../kresources/egroupware/kcal_egroupwareprefs.h ../kresources/egroupware/knotes_egroupwareprefs.h -exchangewizard.lo: ../kresources/lib/kresources_groupwareprefs.h -sloxwizard.lo: ../kresources/slox/kabcsloxprefs.h ../kresources/slox/kcalsloxprefs.h +egroupwarewizard.lo: ../tderesources/egroupware/kabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h +exchangewizard.lo: ../tderesources/lib/tderesources_groupwareprefs.h +sloxwizard.lo: ../tderesources/slox/kabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h xdg_apps_DATA = groupwarewizard.desktop -- cgit v1.2.1