Skip to content

Commit cad19f8

Browse files
author
jobi
committedMay 13, 2005
Tweak of makefiles and prepared for a release.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3376 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_44Before-merge-new_vector_api
1 parent f387975 commit cad19f8

File tree

11 files changed

+105
-75
lines changed

11 files changed

+105
-75
lines changed
 

‎ChangeLog‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
------------------------------------------------------------------------------
33
Version 0.6 'Simon' .... development version
44
QGIS Change Log
5-
2005-04-17 [mcoletti] 0.6devel18
6-
First whack at implementing compensation for opening project files
7-
with stale data source paths.
5+
6+
2005-05-13 [didge] 0.6devel19
7+
** Tweaked makefile stuff and prepared for a release
8+
2005-04-17 [mcoletti] 0.6devel18
9+
** First whack at implementing compensation for opening project files
10+
with stale data source paths.
811
2005-04-17 [timlinux] 0.6devel17
9-
Custom Projection dialog. Various bugfixes plus delete, insert and update of new
10-
records possible. User projections now whow in projection selector but are
11-
still not useable
12+
** Custom Projection dialog. Various bugfixes plus delete, insert and update of new
13+
records possible. User projections now whow in projection selector but are
14+
still not useable
1215
2005-04-16 [ges] 0.6.0devel16
1316
** Fixed bug 1177637 that prevented a PostgreSQL connection from being
1417
completely deleted

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ pkginclude_HEADERS = qgsconfig.h
3636

3737
UIcheck:
3838
@UIS=`find . -name *.ui` && \
39-
if [ `grep "UI version" $$UIS | sed -e '/3.1/d' | wc -l` -ne 0 ]; then \
39+
if [ `grep "UI version" $$UIS | sed -e '/3.1/d' -e '/3.3/d' | wc -l` -ne 0 ]; then \
4040
echo -e "\nWrong UI version:"; \
41-
grep "UI version" $$UIS | sed -e '/3.1/d' -e 's/:.*version="\([0-9\.]*\)".*/ is version \1/g'; \
41+
grep "UI version" $$UIS | sed -e '/3.1/d' -e '/3.3/d' -e 's/:.*version="\([0-9\.]*\)".*/ is version \1/g'; \
4242
echo; \
4343
exit 1; \
4444
fi

‎acinclude.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ case "${host}" in
263263
QT_IS_STATIC=`ls $QTDIR/${_lib}/libqt*.a 2> /dev/null`
264264
if test "x$QT_IS_STATIC" = x; then
265265
QT_IS_STATIC="no"
266-
AC_MSG_ERROR([*** Couldn't find any Qt libraries])
266+
AC_MSG_ERROR([*** Couldn't find any Qt libraries $QTDIR/${_lib}])
267267
else
268268
QT_IS_STATIC="yes"
269269
fi

‎configure.in‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,6 @@ AM_CONDITIONAL([HAVE_SPIT], [test "$ac_spit" = "yes"])
277277
dnl ---------------------------------------------------------------------------
278278
dnl GRASS package
279279
dnl ---------------------------------------------------------------------------
280-
if test "$libdir" = "/usr/lib64"; then
281-
_lib="lib64"
282-
else
283-
_lib="lib"
284-
fi
285-
286280
AC_ARG_WITH(grass,
287281
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)]))
288282

@@ -301,7 +295,7 @@ if test -n "$with_grass" -a x"$with_grass" != "xno"; then
301295
fi
302296

303297
if test ! -f "$GISLIB"; then
304-
AC_MSG_ERROR( [GRASS library not found] )
298+
AC_MSG_ERROR( [GRASS library not found in $with_grass/${_lib}] )
305299
fi
306300
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"
307301

@@ -334,12 +328,24 @@ AC_ARG_ENABLE(gpx,
334328
AC_HELP_STRING([--disable-gpx],
335329
[Disable the GPX provider and the GPS plugin (built by default if libexpat is found)]),
336330
[ac_gpx=$enableval], [ac_gpx=yes])
331+
AC_MSG_CHECKING([GPX provider and GPS plugin should be installed (default: yes)])
332+
AC_MSG_RESULT([$ac_gpx])
337333
have_expat_lib=no
338334
if [ test $ac_gpx = yes ] ; then
339335
AC_CHECK_LIB(expat, XML_ParserCreate, have_expat_lib=yes)
340336
fi
341337
AM_CONDITIONAL([HAVE_EXPAT], [test "$have_expat_lib" = "yes"])
342338

339+
dnl ---------------------------------------------------------------------------
340+
dnl Community registration plugin
341+
dnl ---------------------------------------------------------------------------
342+
AC_ARG_ENABLE(community,
343+
AC_HELP_STRING([--enable-community],
344+
[Enable the community registration plugin (broken!)]),
345+
[ac_com=yes], [ac_com=no])
346+
AC_MSG_CHECKING([community registration plugin should be installed (broken)])
347+
AC_MSG_RESULT([$ac_com])
348+
AM_CONDITIONAL([WITH_COMMUNITY], [test "$ac_com" = "yes"])
343349

344350
dnl ---------------------------------------------------------------------------
345351
dnl Debugging
@@ -391,9 +397,10 @@ AC_CONFIG_FILES([
391397
providers/grass/Makefile
392398
providers/gpx/Makefile
393399
plugins/Makefile
394-
plugins/spit/Makefile
400+
plugins/community_reg_plugin/Makefile
401+
plugins/copyright_label/Makefile
402+
plugins/delimited_text/Makefile
395403
plugins/example/Makefile
396-
plugins/maplayer/Makefile
397404
plugins/geoprocessing/Makefile
398405
plugins/gps_importer/Makefile
399406
plugins/grid_maker/Makefile
@@ -402,25 +409,24 @@ AC_CONFIG_FILES([
402409
plugins/grass/modules/Makefile
403410
plugins/grass/themes/Makefile
404411
plugins/grass/themes/default/Makefile
412+
plugins/maplayer/Makefile
413+
plugins/north_arrow/Makefile
414+
plugins/scale_bar/Makefile
415+
plugins/spit/Makefile
405416
doc/Makefile
406417
doc/install_guide/Makefile
407418
doc/images/Makefile
408419
doc/plugins/Makefile
409420
doc/plugins/geoprocessing/Makefile
410421
doc/plugins/geoprocessing/buffer/Makefile
411422
doc/plugins/delimited_text/Makefile
412-
qgis.spec
413-
plugins/delimited_text/Makefile
414423
tools/Makefile
415424
tools/qgis_config/Makefile
416-
i18n/Makefile
417-
plugins/north_arrow/Makefile
418-
plugins/copyright_label/Makefile
419-
plugins/scale_bar/Makefile
420425
widgets/Makefile
421426
widgets/projectionselector/Makefile
422427
designer_plugins/Makefile
423-
plugins/community_reg_plugin/Makefile
428+
i18n/Makefile
429+
qgis.spec
424430
])
425431

426432
AC_OUTPUT
@@ -446,4 +452,4 @@ echo "The binary will be installed in $prefix/bin"
446452
echo ""
447453
echo "The build is using Qt in $QTDIR"
448454
echo "------------------------------------------"
449-
echo "Configure finished, type 'make' to build."
455+
echo "Configure finished, type 'make' to build."

‎create_qm_files.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# create_qm_files.sh,v 1.4 2004/07/14 18:16:00 gsherman Exp
1010
echo Creating qmake project file
1111
# force the output name to be qgis_qm.pro
12-
/usr/bin/qmake -project -o qgis_qm.pro
12+
qmake -project -o qgis_qm.pro
1313
echo Creating qm files
1414
lrelease -verbose qgis_qm.pro
1515
echo Removing qmake project file

‎designer_plugins/Makefile.am‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,22 @@
1212

1313
plugindir = ${pkglibdir}/designer
1414

15-
1615
%.moc.cpp: %.h
1716
$(MOC) -o $@ $<
1817

1918
# name of the designer plugin
2019
plugin_LTLIBRARIES = qgisdesignerwidgets.la
2120

22-
plugin_MOC = qgsprojectionselectorplugin.moc.cpp
23-
21+
qgisdesignerwidgets_la_SOURCES = qgsdesignerwidgets.cpp \
22+
qgsdesignerwidgets.h
2423

24+
projectionselector_la_MOC = qgsprojectionselectorplugin.moc.cpp
2525

26-
qgisdesignerwidgets_la_SOURCES = qgsprojectionselectorplugin.cpp \
27-
$(plugin_MOC)
28-
BUILT_SOURCES = $(plugin_MOC)
26+
projectionselector_la_SOURCES = qgsprojectionselectorplugin.cpp \
27+
qgsprojectionselectorplugin.h \
28+
$(projectionselector_la_MOC)
2929

3030
#projectionselector_la_LIBADD = ../src/libqgis.la $(QT_LDADD)
3131
qgisdesignerwidgets_la_LIBADD = $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
3232
qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
3333
qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../src/
34-
35-
#EXTRA_DIST = $(plugin_UIC)

‎plugins/Makefile.am‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,43 @@ if HAVE_GRASS
1212
GRASS = grass
1313
endif
1414

15+
if WITH_COMMUNITY
16+
COMMUNITY = community_reg_plugin
17+
endif
18+
1519
SUBDIRS = $(GEOPROCESSING) \
16-
$(SPIT) \
17-
$(GRASS) \
18-
delimited_text \
19-
gps_importer \
20-
grid_maker \
21-
north_arrow \
22-
copyright_label \
23-
scale_bar
20+
$(SPIT) \
21+
$(GRASS) \
22+
$(COMMUNITY) \
23+
delimited_text \
24+
gps_importer \
25+
grid_maker \
26+
north_arrow \
27+
copyright_label \
28+
scale_bar
2429

2530
EXTRA_DIST = \
26-
example/exampleplugin.cpp \
27-
example/exampleplugin.h \
28-
example/Makefile.am \
29-
example/Makefile.in \
30-
example/matrix1.xpm \
31-
maplayer/Makefile.am \
32-
maplayer/Makefile.in \
33-
maplayer/maplayertest.cpp \
34-
maplayer/maplayertest.h \
35-
maplayer/matrix1.xpm \
36-
plugin_builder.pl \
37-
plugin_template/icon.xpm \
38-
plugin_template/Makefile.am \
39-
plugin_template/plugin.cpp \
40-
plugin_template/pluginguibase.ui \
41-
plugin_template/pluginguibase.ui.h \
42-
plugin_template/plugingui.cpp \
43-
plugin_template/plugingui.h \
44-
plugin_template/plugin.h \
45-
plugin_template/README \
46-
qgisplugin.h
31+
example/exampleplugin.cpp \
32+
example/exampleplugin.h \
33+
example/Makefile.am \
34+
example/Makefile.in \
35+
example/matrix1.xpm \
36+
maplayer/Makefile.am \
37+
maplayer/Makefile.in \
38+
maplayer/maplayertest.cpp \
39+
maplayer/maplayertest.h \
40+
maplayer/matrix1.xpm \
41+
plugin_builder.pl \
42+
plugin_template/icon.xpm \
43+
plugin_template/Makefile.am \
44+
plugin_template/plugin.cpp \
45+
plugin_template/pluginguibase.ui \
46+
plugin_template/pluginguibase.ui.h \
47+
plugin_template/plugingui.cpp \
48+
plugin_template/plugingui.h \
49+
plugin_template/plugin.h \
50+
plugin_template/README \
51+
qgisplugin.h
4752

4853

4954
pkginclude_HEADERS=qgisplugin.h

‎plugins/community_reg_plugin/Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,3 @@ communityregplugin_la_LDFLAGS = -avoid-version -module
6161
communityregplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../src
6262

6363
EXTRA_DIST = $(plugin_UIC) icon.xpm
64-

‎plugins/grass/Makefile.am‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ plugin_UIC = qgsgrassselectbase.ui \
6464
qgsgrasseditbase.ui \
6565
qgsgrasseditbase.ui.h \
6666
qgsgrasstoolsbase.ui \
67-
qgsgrasstoolsbase.ui.h \
6867
qgsgrassmodulebase.ui \
69-
qgsgrassmodulebase.ui.h \
7068
qgsgrassattributesbase.ui \
7169
qgsgrassattributesbase.ui.h \
7270
qgsgrassregionbase.ui
@@ -113,4 +111,10 @@ grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRAS
113111
grassplugin_la_LDFLAGS = -avoid-version -module
114112
grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC) $(GDAL_CFLAGS) $(GEOS_CFLAGS)
115113

116-
EXTRA_DIST = $(plugin_UIC) add_vector.xpm add_raster.xpm grass_edit.xpm grass_region.xpm grass_region_edit.xpm
114+
EXTRA_DIST = $(plugin_UIC) \
115+
add_vector.xpm \
116+
add_raster.xpm \
117+
grass_edit.xpm \
118+
grass_region.xpm \
119+
grass_region_edit.xpm \
120+
grass_tools.xpm

‎src/Makefile.am‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ headers = qgisapp.h \
151151
qgsfillstylewidget.h \
152152
splashscreen.h
153153

154-
# qgsvectorsymbologywidget.h
155154

156155
## qt designer files for all the GUI stuff
157156

@@ -200,8 +199,6 @@ qgis_UIC = qgisappbase.ui \
200199
qgsfillstylewidgetbase.ui \
201200
qgslinestylewidgetbase.ui
202201

203-
# qgsvectorsymbologywidgetbase.ui
204-
205202
## all the ui files generate a corresponding header file
206203
qgis_UIHEADERS = $(qgis_UIC:.ui=.uic.h)
207204

@@ -559,11 +556,27 @@ libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION) $(QT_LDADD) $(GDAL_LDADD
559556
libqgis_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) -I../widgets/projectionselector/
560557

561558
## for installing headers in $(includedir)/qgis
562-
pkginclude_HEADERS = $(headers) $(qgis_UIHEADERS) $(qgis_UIH) $(postgresHEADERS) $(postgresUIH)
559+
pkginclude_HEADERS = $(headers) \
560+
$(qgis_UIHEADERS) \
561+
$(qgis_UIH) \
562+
$(postgresHEADERS) \
563+
$(postgresUIH)
564+
563565
pkginclude_dir = $(includedir)/qgis
564566

565567

566568
CLEANFILES = $(BUILT_SOURCES)
567569

568-
EXTRA_DIST = $(postgresHEADERS) $(postgresSOURCES) $(postgresUIC) $(qgis_UIC) $(qgis_UIH) $(postgresUIH) xpm/*.png xpm/*.xpm xpm/16x16/mapserver.xpm xpm/16x16/camera.png
570+
EXTRA_DIST = $(postgresHEADERS) \
571+
$(postgresSOURCES) \
572+
$(postgresUIC) \
573+
$(qgis_UIC) \
574+
xpm/*.png \
575+
xpm/*.xpm \
576+
xpm/16x16/mapserver.xpm \
577+
xpm/16x16/camera.png \
578+
qgsvectorsymbologywidget.h \
579+
qgsvectorsymbologywidgetbase.ui \
580+
qgsvectorsymbologywidgetbase.ui.h
581+
569582
noinst_HEADERS = qgsdatasourceuri.h

‎widgets/projectionselector/Makefile.am‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ plugin_MOC = qgsprojectionselector.moc.cpp \
3636
plugin_UI = qgsprojectionselectorbase.h \
3737
qgsprojectionselectorbase.cpp
3838

39-
plugin_UIC = qgsprojectionselectorbase.ui
39+
plugin_UIC = qgsprojectionselectorbase.ui \
40+
qgsprojectionselectorbase.ui.h \
41+
qgsprojectionselectorbase.uic.h
4042

4143
libqgsprojectionselector_la_SOURCES = qgsprojectionselector.cpp \
4244
$(plugin_UI) \
@@ -50,4 +52,4 @@ libqgsprojectionselector_la_LIBADD = ../../src/libqgis.la $(LDADD) $(QT_LDADD)
5052
libqgsprojectionselector_la_LDFLAGS = -avoid-version
5153
libqgsprojectionselector_la_CXXFLAGS = $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../src/
5254

53-
EXTRA_DIST = $(plugin_UIC)
55+
EXTRA_DIST = $(plugin_UIC)

0 commit comments

Comments
 (0)
Please sign in to comment.