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. --- buildtools/lib/parsers/autotools/CMakeLists.txt | 4 ++-- buildtools/lib/parsers/autotools/Makefile.am | 10 +++++----- buildtools/lib/parsers/autotools/tests/Makefile.am | 4 ++-- buildtools/lib/parsers/qmake/CMakeLists.txt | 4 ++-- buildtools/lib/parsers/qmake/Makefile.am | 10 +++++----- buildtools/lib/parsers/qmake/tests/Makefile.am | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'buildtools/lib/parsers') diff --git a/buildtools/lib/parsers/autotools/CMakeLists.txt b/buildtools/lib/parsers/autotools/CMakeLists.txt index 5bc97247..8226e963 100644 --- a/buildtools/lib/parsers/autotools/CMakeLists.txt +++ b/buildtools/lib/parsers/autotools/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ) -##### tdevautotoolsparser (static) ############## +##### kdevautotoolsparser (static) ############## -tde_add_library( tdevautotoolsparser STATIC_PIC +tde_add_library( kdevautotoolsparser STATIC_PIC SOURCES autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp ) diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 47234583..340d0e38 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -6,9 +6,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -noinst_LTLIBRARIES = libtdevautotoolsparser.la -libtdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) -libtdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp +noinst_LTLIBRARIES = libkdevautotoolsparser.la +libkdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) +libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp parser: cd $(srcdir) ; \ @@ -19,6 +19,6 @@ parser: EXTRA_DIST = autotools.yy autotools.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop AutoTools Parser -DOXYGEN_DOCDIRPREFIX = tdevparser +DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser +DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am index 00c2baba..30c67288 100644 --- a/buildtools/lib/parsers/autotools/tests/Makefile.am +++ b/buildtools/lib/parsers/autotools/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO check_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt index 6ffebfa6..b8328a84 100644 --- a/buildtools/lib/parsers/qmake/CMakeLists.txt +++ b/buildtools/lib/parsers/qmake/CMakeLists.txt @@ -27,9 +27,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/parsers/qmake ) -##### tdevqmakeparser (shared) ################## +##### kdevqmakeparser (shared) ################## -tde_add_library( tdevqmakeparser SHARED +tde_add_library( kdevqmakeparser SHARED SOURCES qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp qmakeastvisitor.cpp qmakedriver.cpp diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index 9e14382a..ff3f175b 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -8,9 +8,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevqmakeparser.la -libtdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) -libtdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ +lib_LTLIBRARIES = libkdevqmakeparser.la +libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) +libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ qmakeastvisitor.cpp qmakedriver.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/parsers/qmake @@ -24,8 +24,8 @@ parser: EXTRA_DIST = qmake.yy qmake.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop QMake parser -DOXYGEN_DOCDIRPREFIX = tdevparser +DOXYGEN_PROJECTNAME = KDevelop QMake parser +DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am noinst_HEADERS = qmake.ll qmake.yy qmake_lex.h diff --git a/buildtools/lib/parsers/qmake/tests/Makefile.am b/buildtools/lib/parsers/qmake/tests/Makefile.am index 74935269..e1932f7e 100644 --- a/buildtools/lib/parsers/qmake/tests/Makefile.am +++ b/buildtools/lib/parsers/qmake/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO noinst_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui -- cgit v1.2.1