From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- src/Makefile.am | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index b0b8a04c..047e89a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,41 +6,41 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/interfaces \ KDE_OPTIONS=nofinal -lib_LTLIBRARIES = libtdevshell.la -libtdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner -libtdevshell_la_LIBADD = \ +lib_LTLIBRARIES = libkdevshell.la +libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +libkdevshell_la_LIBADD = \ $(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \ $(top_builddir)/src/newui/libd.la $(LIB_TDEHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner -libtdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \ +libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \ editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \ mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \ plugincontroller.cpp pluginselectdialog.cpp pluginselectdialog.h pluginselectdialogbase.ui \ projectmanager.cpp projectsession.cpp shellextension.cpp simplemainwindow.cpp \ splashscreen.cpp statusbar.cpp toplevel.cpp -bin_PROGRAMS = tdevelop tdevassistant +bin_PROGRAMS = tdevelop kdevassistant -tdevelop_SOURCES = main.cpp tdevideextension.cpp settingswidget.ui +tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui tdevelop_METASOURCES = AUTO tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner -tdevelop_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner +tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rcdir = $(kde_datadir)/tdevelop rc_DATA = tdevelopui.rc eventsrc -# default TDevelop configuration +# default KDevelop configuration tdevelopdatadir = $(kde_confdir) -tdevelopdata_DATA = tdeveloprc tdevassistantrc +tdevelopdata_DATA = tdeveloprc kdevassistantrc SUBDIRS = profiles profileengine newui tdeconf_update -tdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner -tdevassistant_SOURCES = main_assistant.cpp tdevassistantextension.cpp -tdevassistant_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp +kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner -rc_assistantdir = $(kde_datadir)/tdevassistant -rc_assistant_DATA = tdevassistantui.rc +rc_assistantdir = $(kde_datadir)/kdevassistant +rc_assistant_DATA = kdevassistantui.rc shellincludedir = $(includedir)/tdevelop/shell shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \ generalinfowidget.h languageselectwidget.h mainwindowshare.h partcontroller.h \ @@ -48,9 +48,9 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \ statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \ simplemainwindow.h multibuffer.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions -DOXYGEN_PROJECTNAME = TDevelop Generic Shell -DOXYGEN_DOCDIRPREFIX = tdevshell +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_PROJECTNAME = KDevelop Generic Shell +DOXYGEN_DOCDIRPREFIX = kdevshell include ../Doxyfile.am profilesdatadir = $(kde_datadir)/tdevelop/profiles profilesdata_DATA = projectprofiles -- cgit v1.2.1