diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:13:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:13:12 -0600 |
| commit | c0695dee383cf8b5a856dc412a54238926599956 (patch) | |
| tree | 722fff466787adda2fceda598117d7e7b5560ca0 /src/piklab | |
| parent | 151a9ebb248b018d3036f7da2f58f404851917d6 (diff) | |
| download | piklab-c0695dee383cf8b5a856dc412a54238926599956.tar.gz piklab-c0695dee383cf8b5a856dc412a54238926599956.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/piklab')
| -rw-r--r-- | src/piklab/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/piklab/Makefile.am b/src/piklab/Makefile.am index 6ce837a..eb8b29b 100644 --- a/src/piklab/Makefile.am +++ b/src/piklab/Makefile.am @@ -57,7 +57,7 @@ OBJS = $(top_builddir)/src/libgui/libgui.la \ $(top_builddir)/src/devices/mem24/mem24/libmem24.la $(top_builddir)/src/devices/mem24/base/libmem24base.la \ $(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la -piklab_LDADD = $(OBJS) -lktexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO) +piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO) piklab_DEPENDENCIES = $(OBJS) -piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) piklab_SOURCES = main.cpp |