minor tweaks

diff --git a/cmd/gvedit/.cvsignore b/cmd/gvedit/.cvsignore
index 708e452f9384caad334e8690f0b82510a00049ea..a6753ace49828207dcfd97fb56ae3f6252a13ba0 100644 (file)
--- a/cmd/gvedit/.cvsignore
+++ b/cmd/gvedit/.cvsignore
@@ -6,5 +6,6 @@ qrc_mdi.cpp
 gvedit.pro
 gvedit
 .deps
+.libs
 attrs.txt
 *.pdf

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 7d20bc1d6dc5e8f58654a05efde198899ec2e2ad..16e1dae75e8d1fac35b0e186104a56bd50d024c7 100644 (file)
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -41,22 +41,21 @@ gvedit_LDADD = \
        $(QTCORE_LIBS) \
        $(EXPAT_LIBS) $(Z_LIBS) 
 
-gvedit_SOURCES = main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.cpp \
-       moc_csettings.cpp moc_imageviewer.cpp moc_mainwindow.cpp moc_mdichild.cpp qrc_mdi.cpp
-
 noinst_HEADERS = csettings.h imageviewer.h mainwindow.h mdichild.h ui_settings.h 
 
 BUILT_SOURCES = moc_csettings.cpp moc_imageviewer.cpp moc_mainwindow.cpp moc_mdichild.cpp qrc_mdi.cpp
 
-$(BUILT_SOURCES): mocables
+gvedit_SOURCES = main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.cpp $(BUILT_SOURCES)
 
-qMakefile: gvedit.pro
-       $(QMAKE) -o qMakefile gvedit.pro
+$(BUILT_SOURCES): mocables
 
 .PHONY: mocables
-mocables: main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.cpp qMakefile
+mocables: qMakefile
        $(MAKE) -f qMakefile prefix=${prefix} exec_prefix=${exec_prefix} mocables compiler_rcc_make_all
 
+qMakefile: gvedit.pro
+       $(QMAKE) -o qMakefile gvedit.pro
+
 attrs.txt: $(top_srcdir)/doc/infosrc/attrs
        cp $(top_srcdir)/doc/infosrc/attrs attrs.txt