Fix FTBFS with automake >= 1.12

remotes/origin/feat/cmakeConv
Slávek Banko 11 years ago
parent 3d4505d268
commit 57d8bb3d12

@ -33,7 +33,7 @@ bin_PROGRAMS = kscope
kscope_SOURCES = autocompletionlayout.ui bookmarksdlg.cpp bookmarkslayout.ui \ kscope_SOURCES = autocompletionlayout.ui bookmarksdlg.cpp bookmarkslayout.ui \
calltreedlg.cpp calltreelayout.ui calltreemanager.cpp configfrontend.cpp \ calltreedlg.cpp calltreelayout.ui calltreemanager.cpp configfrontend.cpp \
cscopefrontend.cpp cscopemsgdlg.cpp cscopemsglayout.ui ctagsfrontend.cpp ctagslist.cpp \ cscopefrontend.cpp cscopemsgdlg.cpp cscopemsglayout.ui ctagsfrontend.cpp ctagslist.cpp \
dirscanner.cpp dotfrontend.cpp dotparse.ypp dotscan.lpp editormanager.cpp \ dirscanner.cpp dotfrontend.cpp dotparse.cpp dotscan.lpp editormanager.cpp \
editorpage.cpp editortabs.cpp encoder.cpp filelist.cpp fileview.cpp fileviewlayout.ui \ editorpage.cpp editortabs.cpp encoder.cpp filelist.cpp fileview.cpp fileviewlayout.ui \
frontend.cpp graphedge.cpp graphnode.cpp graphprefdlg.cpp graphpreflayout.ui \ frontend.cpp graphedge.cpp graphnode.cpp graphprefdlg.cpp graphpreflayout.ui \
graphwidget.cpp historypage.cpp historyview.cpp kscope.cpp kscopeactions.cpp \ graphwidget.cpp historypage.cpp historyview.cpp kscope.cpp kscopeactions.cpp \
@ -64,5 +64,13 @@ pics_DATA = file_ro.png file_rw.png file_save.png query_locked.png \
query_unlocked.png tab_list.png call_graph.png called_tree.png calling_tree.png \ query_unlocked.png tab_list.png call_graph.png called_tree.png calling_tree.png \
bookmark.png bookmark.png
BUILT_SOURCES = dotparse.h # automake <=1.11 and automake >=1.12 have different conventions for naming C++ header files
# made by yacc. To work with both, we write our own rule rather than using automake's.
# When (if) we require automake >=1.12 in configure.ac, this can be removed, and we can use
# the automake rule.
dotparse.cpp dotparse.hpp: dotparse.ypp
$(AM_V_GEN) $(YACC) -v --output dotparse.cpp --defines=dotparse.hpp $<
BUILT_SOURCES = dotparse.hpp
DISTCLEANFILES = dotparse.cpp
AM_YFLAGS = -d AM_YFLAGS = -d

@ -2,7 +2,7 @@
%{ %{
#include <qstring.h> #include <qstring.h>
#include "dotparse.h" #include "dotparse.hpp"
%} %}
%option noyywrap %option noyywrap

Loading…
Cancel
Save