Tweak of makefiles and prepared for a release.

git-svn-id: http://svn.osgeo.org/qgis/trunk@3376 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 13, 2005 · cad19f8 · cad19f8
1 parent f387975
commit cad19f8
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 75 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,13 +2,16 @@
 ------------------------------------------------------------------------------
 Version 0.6 'Simon' .... development version
 QGIS Change Log
-	2005-04-17 [mcoletti] 0.6devel18
-	First whack at implementing compensation for opening project files
-	with stale data source paths.
+
+2005-05-13 [didge] 0.6devel19
+** Tweaked makefile stuff and prepared for a release
+2005-04-17 [mcoletti] 0.6devel18
+** First whack at implementing compensation for opening project files
+   with stale data source paths.
 2005-04-17 [timlinux] 0.6devel17
-Custom Projection dialog. Various bugfixes plus delete, insert and update of new
-records possible. User projections now whow in projection selector but are
-still not useable
+** Custom Projection dialog. Various bugfixes plus delete, insert and update of new
+   records possible. User projections now whow in projection selector but are
+   still not useable
 2005-04-16 [ges] 0.6.0devel16
 ** Fixed bug 1177637 that prevented a PostgreSQL connection from being 
    completely deleted

diff --git a/Makefile.am b/Makefile.am
@@ -36,9 +36,9 @@ pkginclude_HEADERS = qgsconfig.h
 
 UIcheck:
 	@UIS=`find . -name *.ui` && \
-	if [ `grep "UI version" $$UIS | sed -e '/3.1/d' | wc -l` -ne 0 ]; then \
+	if [ `grep "UI version" $$UIS | sed -e '/3.1/d' -e '/3.3/d' | wc -l` -ne 0 ]; then \
 		echo -e "\nWrong UI version:"; \
-		grep "UI version" $$UIS | sed -e '/3.1/d' -e 's/:.*version="\([0-9\.]*\)".*/ is version \1/g'; \
+		grep "UI version" $$UIS | sed -e '/3.1/d' -e '/3.3/d' -e 's/:.*version="\([0-9\.]*\)".*/ is version \1/g'; \
 		echo; \
 		exit 1; \
 	fi

diff --git a/acinclude.m4 b/acinclude.m4
@@ -263,7 +263,7 @@ case "${host}" in
       QT_IS_STATIC=`ls $QTDIR/${_lib}/libqt*.a 2> /dev/null`
       if test "x$QT_IS_STATIC" = x; then
         QT_IS_STATIC="no"
-        AC_MSG_ERROR([*** Couldn't find any Qt libraries])
+        AC_MSG_ERROR([*** Couldn't find any Qt libraries $QTDIR/${_lib}])
       else
         QT_IS_STATIC="yes"
       fi

diff --git a/configure.in b/configure.in
@@ -277,12 +277,6 @@ AM_CONDITIONAL([HAVE_SPIT], [test "$ac_spit" = "yes"])
 dnl ---------------------------------------------------------------------------
 dnl GRASS package
 dnl ---------------------------------------------------------------------------
-if test "$libdir" = "/usr/lib64"; then
-  _lib="lib64"
-else
-  _lib="lib"
-fi
-
 AC_ARG_WITH(grass,
     AC_HELP_STRING([--with-grass=DIR],[GRASS Support (full path to GRASS binary package, e.g. --with-grass=/usr1/grass57/dist.i686-pc-linux-gnu)]))
 
@@ -301,7 +295,7 @@ if test -n "$with_grass" -a x"$with_grass" != "xno"; then
     fi
 
     if test ! -f "$GISLIB"; then
-  AC_MSG_ERROR( [GRASS library not found] )
+  AC_MSG_ERROR( [GRASS library not found in $with_grass/${_lib}] )
     fi
     GRASS_LIB="-L$with_grass/${_lib} -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj"
 
@@ -334,12 +328,24 @@ AC_ARG_ENABLE(gpx,
   AC_HELP_STRING([--disable-gpx],
                  [Disable the GPX provider and the GPS plugin (built by default if libexpat is found)]),
                  [ac_gpx=$enableval], [ac_gpx=yes])
+AC_MSG_CHECKING([GPX provider and GPS plugin should be installed (default: yes)])
+AC_MSG_RESULT([$ac_gpx])
 have_expat_lib=no
 if [ test $ac_gpx = yes ] ; then
   AC_CHECK_LIB(expat, XML_ParserCreate, have_expat_lib=yes)
 fi
 AM_CONDITIONAL([HAVE_EXPAT], [test "$have_expat_lib" = "yes"])
 
+dnl ---------------------------------------------------------------------------
+dnl Community registration plugin
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(community,
+  AC_HELP_STRING([--enable-community],
+                 [Enable the community registration plugin (broken!)]),
+                 [ac_com=yes], [ac_com=no])
+AC_MSG_CHECKING([community registration plugin should be installed (broken)])
+AC_MSG_RESULT([$ac_com])
+AM_CONDITIONAL([WITH_COMMUNITY], [test "$ac_com" = "yes"])
 
 dnl ---------------------------------------------------------------------------
 dnl Debugging
@@ -391,9 +397,10 @@ AC_CONFIG_FILES([
   providers/grass/Makefile
   providers/gpx/Makefile
   plugins/Makefile
-  plugins/spit/Makefile
+  plugins/community_reg_plugin/Makefile
+  plugins/copyright_label/Makefile
+  plugins/delimited_text/Makefile
   plugins/example/Makefile
-  plugins/maplayer/Makefile
   plugins/geoprocessing/Makefile
   plugins/gps_importer/Makefile
   plugins/grid_maker/Makefile
@@ -402,25 +409,24 @@ AC_CONFIG_FILES([
   plugins/grass/modules/Makefile
   plugins/grass/themes/Makefile
   plugins/grass/themes/default/Makefile
+  plugins/maplayer/Makefile
+  plugins/north_arrow/Makefile
+  plugins/scale_bar/Makefile
+  plugins/spit/Makefile
   doc/Makefile
   doc/install_guide/Makefile
   doc/images/Makefile
   doc/plugins/Makefile
   doc/plugins/geoprocessing/Makefile
   doc/plugins/geoprocessing/buffer/Makefile
   doc/plugins/delimited_text/Makefile
-  qgis.spec
-  plugins/delimited_text/Makefile
   tools/Makefile
   tools/qgis_config/Makefile
-  i18n/Makefile
-  plugins/north_arrow/Makefile
-  plugins/copyright_label/Makefile
-  plugins/scale_bar/Makefile
   widgets/Makefile
   widgets/projectionselector/Makefile
   designer_plugins/Makefile
-  plugins/community_reg_plugin/Makefile
+  i18n/Makefile
+  qgis.spec
 ])
 
 AC_OUTPUT
@@ -446,4 +452,4 @@ echo "The binary will be installed in $prefix/bin"
 echo ""
 echo "The build is using Qt in $QTDIR"
 echo "------------------------------------------"
-echo "Configure finished, type 'make' to build."
+echo "Configure finished, type 'make' to build."
diff --git a/create_qm_files.sh b/create_qm_files.sh
@@ -9,7 +9,7 @@
 # create_qm_files.sh,v 1.4 2004/07/14 18:16:00 gsherman Exp
 echo Creating qmake project file
 # force the output name to be qgis_qm.pro
-/usr/bin/qmake -project -o qgis_qm.pro
+qmake -project -o qgis_qm.pro
 echo Creating qm files
 lrelease -verbose qgis_qm.pro
 echo Removing qmake project file

diff --git a/designer_plugins/Makefile.am b/designer_plugins/Makefile.am
@@ -12,24 +12,22 @@
 
 plugindir = ${pkglibdir}/designer
 
-
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
 
 # name of the designer plugin
 plugin_LTLIBRARIES = qgisdesignerwidgets.la
 
-plugin_MOC = qgsprojectionselectorplugin.moc.cpp		
-
+qgisdesignerwidgets_la_SOURCES =  qgsdesignerwidgets.cpp \
+		qgsdesignerwidgets.h
 
+projectionselector_la_MOC = qgsprojectionselectorplugin.moc.cpp
 
-qgisdesignerwidgets_la_SOURCES =  qgsprojectionselectorplugin.cpp	\
-			         $(plugin_MOC)
-BUILT_SOURCES = $(plugin_MOC) 
+projectionselector_la_SOURCES = qgsprojectionselectorplugin.cpp \
+		qgsprojectionselectorplugin.h \
+		$(projectionselector_la_MOC)
 
 #projectionselector_la_LIBADD =  ../src/libqgis.la $(QT_LDADD)  
 qgisdesignerwidgets_la_LIBADD =  $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
 qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
 qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../src/
-
-#EXTRA_DIST = $(plugin_UIC) 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
@@ -12,38 +12,43 @@ if HAVE_GRASS
 GRASS = grass
 endif
 
+if WITH_COMMUNITY
+COMMUNITY = community_reg_plugin
+endif
+
 SUBDIRS = $(GEOPROCESSING) \
-					$(SPIT) \
-					$(GRASS) \
-					delimited_text \
-					gps_importer \
-					grid_maker \
-					north_arrow \
-					copyright_label \
-					scale_bar 
+		$(SPIT) \
+		$(GRASS) \
+		$(COMMUNITY) \
+		delimited_text \
+		gps_importer \
+		grid_maker \
+		north_arrow \
+		copyright_label \
+		scale_bar
 
 EXTRA_DIST = \
-	    example/exampleplugin.cpp \
-	    example/exampleplugin.h \
-	    example/Makefile.am \
-	    example/Makefile.in \
-	    example/matrix1.xpm \
-	    maplayer/Makefile.am \
-	    maplayer/Makefile.in \
-	    maplayer/maplayertest.cpp \
-	    maplayer/maplayertest.h \
-	    maplayer/matrix1.xpm \
-	    plugin_builder.pl \
-	    plugin_template/icon.xpm \
-	    plugin_template/Makefile.am \
-	    plugin_template/plugin.cpp \
-	    plugin_template/pluginguibase.ui \
-	    plugin_template/pluginguibase.ui.h \
-	    plugin_template/plugingui.cpp \
-	    plugin_template/plugingui.h \
-	    plugin_template/plugin.h \
-	    plugin_template/README \
-			qgisplugin.h 
+		example/exampleplugin.cpp \
+		example/exampleplugin.h \
+		example/Makefile.am \
+		example/Makefile.in \
+		example/matrix1.xpm \
+		maplayer/Makefile.am \
+		maplayer/Makefile.in \
+		maplayer/maplayertest.cpp \
+		maplayer/maplayertest.h \
+		maplayer/matrix1.xpm \
+		plugin_builder.pl \
+		plugin_template/icon.xpm \
+		plugin_template/Makefile.am \
+		plugin_template/plugin.cpp \
+		plugin_template/pluginguibase.ui \
+		plugin_template/pluginguibase.ui.h \
+		plugin_template/plugingui.cpp \
+		plugin_template/plugingui.h \
+		plugin_template/plugin.h \
+		plugin_template/README \
+		qgisplugin.h 
 
 
 pkginclude_HEADERS=qgisplugin.h
diff --git a/plugins/community_reg_plugin/Makefile.am b/plugins/community_reg_plugin/Makefile.am
@@ -61,4 +61,3 @@ communityregplugin_la_LDFLAGS = -avoid-version -module
 communityregplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../src
 
 EXTRA_DIST = $(plugin_UIC) icon.xpm
-
diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am
@@ -64,9 +64,7 @@ plugin_UIC = qgsgrassselectbase.ui \
 	     qgsgrasseditbase.ui \
 	     qgsgrasseditbase.ui.h \
 	     qgsgrasstoolsbase.ui \
-	     qgsgrasstoolsbase.ui.h \
 	     qgsgrassmodulebase.ui \
-	     qgsgrassmodulebase.ui.h \
 	     qgsgrassattributesbase.ui \
 	     qgsgrassattributesbase.ui.h \
 	     qgsgrassregionbase.ui 
@@ -113,4 +111,10 @@ grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRAS
 grassplugin_la_LDFLAGS = -avoid-version -module
 grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS)
 
-EXTRA_DIST = $(plugin_UIC) add_vector.xpm add_raster.xpm grass_edit.xpm grass_region.xpm grass_region_edit.xpm
+EXTRA_DIST = $(plugin_UIC) \
+	add_vector.xpm \
+	add_raster.xpm \
+	grass_edit.xpm \
+	grass_region.xpm \
+	grass_region_edit.xpm \
+	grass_tools.xpm
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -151,7 +151,6 @@ headers =	qgisapp.h					\
 		qgsfillstylewidget.h				\
 		splashscreen.h				
 
-#		qgsvectorsymbologywidget.h			
 
 ## qt designer files for all the GUI stuff
 
@@ -200,8 +199,6 @@ qgis_UIC =	qgisappbase.ui				\
 		qgsfillstylewidgetbase.ui		\
 		qgslinestylewidgetbase.ui
 
-#		qgsvectorsymbologywidgetbase.ui		
-
 ## all the ui files generate a corresponding header file
 qgis_UIHEADERS = $(qgis_UIC:.ui=.uic.h)
 
@@ -559,11 +556,27 @@ libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION) $(QT_LDADD) $(GDAL_LDADD
 libqgis_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) -I../widgets/projectionselector/
 
 ## for installing headers in $(includedir)/qgis
-pkginclude_HEADERS = $(headers) $(qgis_UIHEADERS) $(qgis_UIH) $(postgresHEADERS) $(postgresUIH)
+pkginclude_HEADERS = $(headers) \
+		$(qgis_UIHEADERS) \
+		$(qgis_UIH) \
+		$(postgresHEADERS) \
+		$(postgresUIH)
+
 pkginclude_dir = $(includedir)/qgis
 
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = $(postgresHEADERS) $(postgresSOURCES) $(postgresUIC) $(qgis_UIC) $(qgis_UIH) $(postgresUIH) xpm/*.png xpm/*.xpm xpm/16x16/mapserver.xpm xpm/16x16/camera.png 
+EXTRA_DIST = $(postgresHEADERS) \
+		$(postgresSOURCES) \
+		$(postgresUIC) \
+		$(qgis_UIC) \
+		xpm/*.png \
+		xpm/*.xpm \
+		xpm/16x16/mapserver.xpm \
+		xpm/16x16/camera.png \
+		qgsvectorsymbologywidget.h \
+		qgsvectorsymbologywidgetbase.ui \
+		qgsvectorsymbologywidgetbase.ui.h
+
 noinst_HEADERS = qgsdatasourceuri.h
diff --git a/widgets/projectionselector/Makefile.am b/widgets/projectionselector/Makefile.am
@@ -36,7 +36,9 @@ plugin_MOC = qgsprojectionselector.moc.cpp		\
 plugin_UI = qgsprojectionselectorbase.h \
 	    qgsprojectionselectorbase.cpp 
 
-plugin_UIC = qgsprojectionselectorbase.ui
+plugin_UIC = qgsprojectionselectorbase.ui \
+    qgsprojectionselectorbase.ui.h \
+	qgsprojectionselectorbase.uic.h
 
 libqgsprojectionselector_la_SOURCES =  qgsprojectionselector.cpp	\
 			         $(plugin_UI)			\
@@ -50,4 +52,4 @@ libqgsprojectionselector_la_LIBADD =  ../../src/libqgis.la $(LDADD) $(QT_LDADD)
 libqgsprojectionselector_la_LDFLAGS = -avoid-version 
 libqgsprojectionselector_la_CXXFLAGS = $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../src/
 
-EXTRA_DIST = $(plugin_UIC) 
+EXTRA_DIST = $(plugin_UIC)