diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kalarm | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalarm')
| -rw-r--r-- | kalarm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kalarm/Makefile.am | 2 | ||||
| -rw-r--r-- | kalarm/kalarmd/Makefile.am | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt index d6a8e052f..b93cc6712 100644 --- a/kalarm/CMakeLists.txt +++ b/kalarm/CMakeLists.txt @@ -74,6 +74,6 @@ tde_add_executable( kalarm AUTOMOC kalarmd/alarmguiiface.skel LINK kalarm-static kalarmd-static - kpimidentities-shared kutils-shared ${ARTS_LIBRARIES} + kpimidentities-shared tdeutils-shared ${ARTS_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am index 98385f9e6..a8e0e8bd5 100644 --- a/kalarm/Makefile.am +++ b/kalarm/Makefile.am @@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \ $(top_builddir)/kalarm/kalarmd/libkalarmd.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la \ - -lkabc -lkutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST) + -lkabc -ltdeutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST) noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \ alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \ editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \ diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am index 1badcb667..f6dd508d3 100644 --- a/kalarm/kalarmd/Makefile.am +++ b/kalarm/kalarmd/Makefile.am @@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes) noinst_LTLIBRARIES = libkalarmd.la -libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libkalarmd_la_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub bin_PROGRAMS = kalarmd -kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \ adcalendar.cpp adconfigdata.cpp clientinfo.cpp \ |