From 15abbd08a9075b0cc6ea194251afe7cc4f65fea3 Mon Sep 17 00:00:00 2001
From: g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Mon, 26 Sep 2005 23:04:13 +0000
Subject: [PATCH] Apply patch 1305149, with some additional mods, to get qgis
 head to compile from a fresh cvs checkout

git-svn-id: http://svn.osgeo.org/qgis/trunk@3987 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 widgets/projectionselector/Makefile.am | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/widgets/projectionselector/Makefile.am b/widgets/projectionselector/Makefile.am
index d4deb5185dd..23f99eebb72 100644
--- a/widgets/projectionselector/Makefile.am
+++ b/widgets/projectionselector/Makefile.am
@@ -18,23 +18,15 @@ endif
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
 
-%.moc.uic.cpp: %.uic.h
-	$(MOC) -o $@ $<
-
-if HAVE_QT3
-%.uic.h: %.ui 
+%.h: %.ui 
 	$(UIC) -o $@ $<
-endif
-
 if HAVE_QT4
-%.uic.h: %.ui 
-	$(UIC) -o $@ $<
 	../tools/qgis-qt3to4.pl -uic $@
 endif
 
 if !NO_UIC_IMPLEMENTATIONS
-%.uic.cpp: %.ui
-	$(UIC) -o $@ -impl $*.uic.h $<
+%.cpp: %.ui
+	$(UIC) -o $@ -impl $*.h $<
 endif
 
 # %.h: %.ui
@@ -50,12 +42,11 @@ plugin_LTLIBRARIES = libqgsprojectionselector.la
 plugin_MOC = qgsprojectionselector.moc.cpp		\
 	     qgsprojectionselectorbase.moc.cpp
 
-plugin_UI = qgsprojectionselectorbase.uic.h \
-	    qgsprojectionselectorbase.uic.cpp
+plugin_UI = qgsprojectionselectorbase.h \
+	    qgsprojectionselectorbase.cpp
 
 plugin_UIC = qgsprojectionselectorbase.ui \
-	qgsprojectionselectorbase.ui.h \
-	qgsprojectionselectorbase.uic.h
+	qgsprojectionselectorbase.h 
 
 libqgsprojectionselector_la_SOURCES =  qgsprojectionselector.cpp	\
 			         $(plugin_UI)			\