Remove copy of qgsmessageviewer from plugins/spit/ and use the one in…

… src/ to avoid Mac duplicate symbol link errors. (Note: "make clean" should be done to plugins/spit/ before acquiring this revision to avoid "make" problems. See qgis-developer list for more details if problems occur.) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4478 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 5, 2006 · 93d817e · 93d817e
1 parent 638ab43
commit 93d817e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 140 deletions.
diff --git a/plugins/spit/Makefile.am b/plugins/spit/Makefile.am
@@ -23,21 +23,17 @@ ui_%.h: %.ui
 	$(UIC) -o $@ $<
 
 spit_MOC = qgsspit.moc.cpp \
-	qgsconnectiondialog.moc.cpp \
 	qgsshapefile.moc.cpp \
-	qgsmessageviewer.moc.cpp \
 	qgseditreservedwordsdialog.moc.cpp 
 
 
 spitplugin_la_MOC = $(spit_MOC) qgsspitplugin.moc.cpp
 
 spit_UI = ui_qgsconnectiondialogbase.h \
 	ui_qgsspitbase.h \
-	ui_qgsmessageviewerbase.h \
 	ui_qgseditreservedwordsbase.h 
 
 spit_UIC = qgsconnectiondialogbase.ui \
-	qgsmessageviewerbase.ui \
 	qgsspitbase.ui \
 	qgseditreservedwordsbase.ui 
 
@@ -48,8 +44,6 @@ common_sources =  qgsspit.cpp \
 	qgsconnectiondialog.h \
 	qgsshapefile.cpp \
 	qgsshapefile.h \
-	qgsmessageviewer.cpp \
-	qgsmessageviewer.h \
 	qgseditreservedwordsdialog.h \
 	qgseditreservedwordsdialog.cpp \
 	$(spit_UI)
@@ -58,7 +52,7 @@ spitplugin_la_SOURCES =  $(common_sources) \
 	qgsspitplugin.cpp \
 	qgsspitplugin.h
 
-spit_SOURCES = $(common_sources) ../../src/qgspgutil.cpp  main.cpp $(SPIT_UIC) $(spit_MOC)
+spit_SOURCES = ../../src/qgsmessageviewer.cpp ../../src/qgspgutil.cpp $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC)
 
 nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)
 
@@ -67,8 +61,6 @@ nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)
 ##qgsconnectiondialogbase.h: qgsconnectiondialogbase.ui
 ##qgsspitbase.cpp: qgsspitbase.h qgsspitbase.ui
 ##qgsspitbase.h: qgsspitbase.ui
-##qgsmessageviewerbase.cpp: qgsmessageviewerbase.h qgsmessageviewerbase.ui
-##qgsmessageviewerbase.h: qgsmessageviewerbase.ui
 
 BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)
 

diff --git a/plugins/spit/qgsmessageviewer.cpp b/plugins/spit/qgsmessageviewer.cpp
diff --git a/plugins/spit/qgsmessageviewer.h b/plugins/spit/qgsmessageviewer.h
diff --git a/plugins/spit/qgsmessageviewerbase.ui b/plugins/spit/qgsmessageviewerbase.ui