Proposed patch fix for issue #2463

Dev
1

Proposed patch file to fix Graphviz make dist issue #2463

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 8b711623c..7b095e5ca 100644
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -41,7 +41,7 @@ noinst_HEADERS = csettings.h imageviewer.h mainwindow.h mdichild.h ui_settings.h
 
 MOCABLES = moc_csettings.cpp moc_imageviewer.cpp moc_mainwindow.cpp moc_mdichild.cpp qrc_mdi.cpp
 
-gvedit_SOURCES = main.cpp csettings.cpp imageviewer.cpp mainwindow.cpp mdichild.cpp $(MOCABLES)
+gvedit_SOURCES = main.cpp csettings.cpp imageviewer.cpp mainwindow.cpp mdichild.cpp
 
 $(MOCABLES): mocables
 
@@ -64,8 +64,8 @@ SUFFIXES = .1 .1.pdf
 
 EXTRA_DIST = gvedit.vcxproj* gvedit.pro.in mdi.qrc $(mans)
 
-CLEANFILES = moc_csettings.cpp moc_imageviewer.cpp moc_mainwindow.cpp moc_mdichild.cpp qrc_mdi.cpp
-DISTCLEANFILES = attrs.txt qMakefile $(pdf_DATA)
+CLEANFILES = qMakefile $(MOCABLES)
+DISTCLEANFILES = attrs.txt $(pdf_DATA)
 
 clean-local:
        -$(MAKE) -f qMakefile clean
2

Thanks for slogging through this! This is a good idea, but not quite how you achieve this. Over the past couple of days, I’ve had several failed attempts at this, and I think I’ve finally got it. Will post an MR in the next hour or so…

3

Will this fix also fix the cmake build on macOS where Qt is not installed? I have to specify -Dwith_gvedit=OFF

4

That was fixed in cmake: move more options to tristate (!3428) · Merge requests · graphviz / graphviz · GitLab