make it build with qt4

diff --git a/cmd/gvedit/.cvsignore b/cmd/gvedit/.cvsignore
index 3dda72986fc5af262451a760393b3a7065938c80..a7b3371dc343aa96ef4b070d8fbfa1e964696617 100644 (file)
--- a/cmd/gvedit/.cvsignore
+++ b/cmd/gvedit/.cvsignore
@@ -1,2 +1,6 @@
 Makefile.in
 Makefile
+qMakefile
+moc_*
+qrc_mdi.cpp
+gvedit

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 3489828a6444a4af04a89bc6b461272a0ff8f9de..ea2cb3171e4ecb41412a197fcb12d2817c375dc1 100644 (file)
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -3,6 +3,14 @@
 
 SUBDIRS = ui images
 
+all: gvedit
+
+qMakefile: gvedit.pro
+       qmake-qt4 -o qMakefile gvedit.pro
+
+gvedit: main.cpp qMakefile
+       $(MAKE) -f qMakefile prefix=${prefix} libdir=${libdir}
+
 EXTRA_DIST = csettings.cpp csettings.h document1.png document2.png \
        gvedit.pro gvedit.ncb gvedit.sln gvedit.vcproj gvedit.vcproj.RESEARCH.arif.user gvedit.vcproj.user \
        imageviewer.cpp imageviewer.h \

diff --git a/cmd/gvedit/gvedit.pro b/cmd/gvedit/gvedit.pro
deleted file mode 100644 (file)
index cc8f191..0000000
--- a/cmd/gvedit/gvedit.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-
-DEFINES += HAVE_CONFIG_H GVEDIT_DATADIR=/Users/erg/share/graphviz/gvedit
-LIBS += -L/Users/erg/lib -lgvc -lgraph -lcdt
-INCLUDEPATH += ../../lib/gvc ../../lib/common ../../lib/pathplan ../../lib/graph ../../lib/cdt ../..
-
-CONFIG += qt
-HEADERS = mainwindow.h mdichild.h csettings.h imageviewer.h ui_settings.h
-SOURCES = main.cpp mainwindow.cpp mdichild.cpp csettings.cpp imageviewer.cpp
-RESOURCES     = mdi.qrc
-

diff --git a/cmd/gvedit/gvedit.pro.in b/cmd/gvedit/gvedit.pro.in
new file mode 100644 (file)
index 0000000..4ebdc85
--- /dev/null
+++ b/cmd/gvedit/gvedit.pro.in
@@ -0,0 +1,19 @@
+
+DEFINES += HAVE_CONFIG_H GVEDIT_DATADIR=@datadir@/graphviz/gvedit
+LIBS += -L@libdir@ -lgvc -lgraph -lcdt
+INCLUDEPATH += \
+       /usr/include/Qt \
+       /usr/include/QtCore \
+       /usr/include/QtGui \
+       ../../lib/gvc \
+       ../../lib/common \
+       ../../lib/pathplan \
+       ../../lib/graph \
+       ../../lib/cdt \
+       ../..
+
+CONFIG += qt
+HEADERS = mainwindow.h mdichild.h csettings.h imageviewer.h ui_settings.h
+SOURCES = main.cpp mainwindow.cpp mdichild.cpp csettings.cpp imageviewer.cpp
+RESOURCES     = mdi.qrc
+

diff --git a/cmd/gvedit/images/Makefile.am b/cmd/gvedit/images/Makefile.am
index 7c1fcc1ff710e8ecb7c5a94599b7da8155b41b9f..dc488c7796652f4b7f4a2476cd9308f1de3f4cb6 100644 (file)
--- a/cmd/gvedit/images/Makefile.am
+++ b/cmd/gvedit/images/Makefile.am
@@ -1,5 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+all:
+
 EXTRA_DIST = copy.png cut.png export.png icon.png new.png open.png \
        paste.png run.png save.png save_as.png settings.png

diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
index 96c53eeb23e6f28184e855b58ac5b76b41b09988..bba01f936feb992cba4c4becc73204d1c6c31ba1 100644 (file)
--- a/cmd/gvedit/main.cpp
+++ b/cmd/gvedit/main.cpp
@@ -18,6 +18,7 @@
 #ifdef WIN32_DLL
 #include "windows.h"
 #endif
+#include <stdio.h>
 #include <QApplication>
 #include "mainwindow.h"
 

diff --git a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
index 4bea9e327f9d61f15eed84256e339862743175c1..c058801fc208598453ac213bc1ff6a4feffaa9ee 100644 (file)
--- a/cmd/gvedit/mainwindow.cpp
+++ b/cmd/gvedit/mainwindow.cpp
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include <QtGui>
-#include <qframe>
+#include <qframe.h>
 #include "mainwindow.h"
 #include "mdichild.h"
 #include "csettings.h"

diff --git a/cmd/gvedit/ui/Makefile.am b/cmd/gvedit/ui/Makefile.am
index 837573c434ad07eaa5cfb16c6490257c6ffb4dc7..1cac5d5fd83d477388aacc4cd0d1b283a9bb0dc0 100644 (file)
--- a/cmd/gvedit/ui/Makefile.am
+++ b/cmd/gvedit/ui/Makefile.am
@@ -1,5 +1,6 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+all:
 
 EXTRA_DIST = main.ui settings.ui

diff --git a/cmd/gvmap/.cvsignore b/cmd/gvmap/.cvsignore
index f3e326bb9d29446b960415a5e477163f823fd4fb..08c208f9d3c54f277447a04b5fb2f5a69f9b1d05 100644 (file)
--- a/cmd/gvmap/.cvsignore
+++ b/cmd/gvmap/.cvsignore
@@ -1,4 +1,7 @@
 Makefile.in
 Makefile
-.deps
 *.1.pdf
+gvmap
+cluster
+.deps
+.libs

diff --git a/configure.ac b/configure.ac
index 7a32aef4d5f500c04b0faa7beb0fe4b85ccb488b..3304f0031c30a96f0a7565c0e13a4d9be804d54e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3238,6 +3238,7 @@ AC_CONFIG_FILES(Makefile
     cmd/smyrna/Makefile
     cmd/gvmap/Makefile
        cmd/gvedit/Makefile
+       cmd/gvedit/gvedit.pro
        cmd/gvedit/ui/Makefile
        cmd/gvedit/images/Makefile
        tclpkg/Makefile

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 4ed31697f291c55c6a31d61635729892b9eb0441..62005d48ddde52f5673a150b3838d452a27fa782 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -114,6 +114,8 @@ BuildRequires: python python-devel
 BuildRequires: java-devel
 %define PHP 1
 BuildRequires: php-devel
+%define QT 0
+BuildRequires: qt-devel
 %ifnarch ppc64
 %define SHARP 1
 BuildRequires: mono-core
@@ -266,6 +268,21 @@ LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
 %{_libdir}/graphviz/*fdb
 %endif
 
+#-- graphviz-qt rpm --------------------------------------------------
+%if 0%{?QT}
+%package qt
+Group:            Applications/Multimedia
+Summary:          Graphviz applications using QT
+Requires:         graphviz = %{version}-%{release}
+
+%description qt
+Graphviz applications using QT - currently just gvedit
+
+%files qt
+%{_bindir}/gvedit
+%{_datadir}/graphviz/gvedit/*
+%endif
+
 #-- graphviz-sharp rpm --------------------------------------------
 %if 0%{?SHARP}
 %package sharp