Skip to content

Commit 26ac9f2

Browse files
author
gsherman
committedJul 27, 2002
mods for kdevelop
git-svn-id: http://svn.osgeo.org/qgis/trunk@59 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7640708 commit 26ac9f2

File tree

5 files changed

+343
-741
lines changed

5 files changed

+343
-741
lines changed
 

‎Makefile.in

Lines changed: 99 additions & 247 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
2-
# KDE tags expanded automatically by am_edit - $Revision$
32

43
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
54
# Free Software Foundation, Inc.
@@ -237,9 +236,7 @@ x_libraries = @x_libraries@
237236

238237
bin_PROGRAMS = qgis
239238

240-
#>- qgis_SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnectionbase.ui qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselectbase.ui qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisappbase.ui qgisapp.cpp main.cpp
241-
#>+ 1
242-
qgis_SOURCES=qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp qgsnewconnectionbase.cpp qgsdbsourceselectbase.cpp qgisappbase.cpp
239+
qgis_SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnectionbase.ui qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselectbase.ui qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisappbase.ui qgisapp.cpp main.cpp
243240
SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp
244241
INTERFACES = qgsnewconnectionbase.ui qgsdbsourceselectbase.ui qgisappbase.ui
245242
TRANSLATIONS =
@@ -255,7 +252,7 @@ EXTRA_DIST = filenew.xpm filesave.xpm fileopen.xpm main.cpp qgisapp.cpp qgisapp.
255252
# set the include path for X, qt and KDE
256253
INCLUDES = $(all_includes)
257254

258-
#>- qgis_METASOURCES = AUTO
255+
qgis_METASOURCES = AUTO
259256

260257
# the library search path.
261258
qgis_LDFLAGS = $(all_libraries)
@@ -276,19 +273,7 @@ am_qgis_OBJECTS = qgsrect.$(OBJEXT) qgsrasterlayer.$(OBJEXT) \
276273
qgsdatabaselayer.$(OBJEXT) qgsdatabase.$(OBJEXT) \
277274
qgscoordinatetransform.$(OBJEXT) qgisapp.$(OBJEXT) \
278275
main.$(OBJEXT)
279-
#>- qgis_OBJECTS = $(am_qgis_OBJECTS)
280-
#>+ 11
281-
qgis_final_OBJECTS = qgis.all_cpp.o
282-
qgis_nofinal_OBJECTS = qgsrect.$(OBJEXT) qgsrasterlayer.$(OBJEXT) \
283-
qgspoint.$(OBJEXT) qgsnewconnection.$(OBJEXT) \
284-
qgsmaplayer.$(OBJEXT) qgsmapcanvas.$(OBJEXT) \
285-
qgsdbsourceselect.$(OBJEXT) qgsdatasource.$(OBJEXT) \
286-
qgsdatabaselayer.$(OBJEXT) qgsdatabase.$(OBJEXT) \
287-
qgscoordinatetransform.$(OBJEXT) qgisapp.$(OBJEXT) \
288-
main.$(OBJEXT) qgsnewconnectionbase.$(OBJEXT) qgsdbsourceselectbase.$(OBJEXT) qgisappbase.$(OBJEXT)\
289-
qgsmapcanvas.moc.o
290-
@KDE_USE_FINAL_FALSE@qgis_OBJECTS = $(qgis_nofinal_OBJECTS)
291-
@KDE_USE_FINAL_TRUE@qgis_OBJECTS = $(qgis_final_OBJECTS)
276+
qgis_OBJECTS = $(am_qgis_OBJECTS)
292277
qgis_DEPENDENCIES =
293278

294279
DEFS = @DEFS@
@@ -298,31 +283,21 @@ LDFLAGS = @LDFLAGS@
298283
LIBS = @LIBS@
299284
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
300285
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/main.Po $(DEPDIR)/qgisapp.Po \
301-
@AMDEP_TRUE@ $(DEPDIR)/qgscoordinatetransform.Po \
302-
@AMDEP_TRUE@ $(DEPDIR)/qgsdatabase.Po \
303-
@AMDEP_TRUE@ $(DEPDIR)/qgsdatabaselayer.Po \
304-
@AMDEP_TRUE@ $(DEPDIR)/qgsdatasource.Po \
305-
@AMDEP_TRUE@ $(DEPDIR)/qgsdbsourceselect.Po \
306-
@AMDEP_TRUE@ $(DEPDIR)/qgsmapcanvas.Po $(DEPDIR)/qgsmaplayer.Po \
307-
@AMDEP_TRUE@ $(DEPDIR)/qgsnewconnection.Po $(DEPDIR)/qgspoint.Po \
308-
@AMDEP_TRUE@ $(DEPDIR)/qgsrasterlayer.Po $(DEPDIR)/qgsrect.Po
309-
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
310-
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
311-
#>+ 2
286+
@AMDEP_TRUE@ $(DEPDIR)/qgscoordinatetransform.Po \
287+
@AMDEP_TRUE@ $(DEPDIR)/qgsdatabase.Po \
288+
@AMDEP_TRUE@ $(DEPDIR)/qgsdatabaselayer.Po \
289+
@AMDEP_TRUE@ $(DEPDIR)/qgsdatasource.Po \
290+
@AMDEP_TRUE@ $(DEPDIR)/qgsdbsourceselect.Po \
291+
@AMDEP_TRUE@ $(DEPDIR)/qgsmapcanvas.Po $(DEPDIR)/qgsmaplayer.Po \
292+
@AMDEP_TRUE@ $(DEPDIR)/qgsnewconnection.Po $(DEPDIR)/qgspoint.Po \
293+
@AMDEP_TRUE@ $(DEPDIR)/qgsrasterlayer.Po $(DEPDIR)/qgsrect.Po
312294
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
313-
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
314-
#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
315-
#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
316-
#>- $(AM_CXXFLAGS) $(CXXFLAGS)
317-
#>+ 3
318-
LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
295+
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
296+
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
319297
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
320-
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
298+
$(AM_CXXFLAGS) $(CXXFLAGS)
321299
CXXLD = $(CXX)
322-
#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
323-
#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
324-
#>+ 2
325-
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
300+
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
326301
$(AM_LDFLAGS) $(LDFLAGS) -o $@
327302
CXXFLAGS = @CXXFLAGS@
328303
DIST_SOURCES = $(qgis_SOURCES)
@@ -335,9 +310,7 @@ DIST_COMMON = Makefile.am Makefile.in
335310
DIST_SUBDIRS = $(SUBDIRS)
336311
SOURCES = qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp
337312

338-
#>- all: all-recursive
339-
#>+ 1
340-
all: docs-am all-recursive
313+
all: all-recursive
341314

342315
.SUFFIXES:
343316
.SUFFIXES: .cpp .lo .o .obj
@@ -351,36 +324,32 @@ clean-libtool:
351324
distclean-libtool:
352325
-rm -f libtool
353326
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
354-
#>- cd $(top_srcdir) && \
355-
#>- $(AUTOMAKE) --gnu qgis/Makefile
356-
#>+ 3
357327
cd $(top_srcdir) && \
358-
$(AUTOMAKE) --gnu qgis/Makefile
359-
cd $(top_srcdir) && perl admin/am_edit qgis/Makefile.in
328+
$(AUTOMAKE) --gnu qgis/Makefile
360329
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
361330
cd $(top_builddir) && \
362-
CONFIG_HEADERS= CONFIG_LINKS= \
363-
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
331+
CONFIG_HEADERS= CONFIG_LINKS= \
332+
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
364333
install-binPROGRAMS: $(bin_PROGRAMS)
365334
@$(NORMAL_INSTALL)
366335
$(mkinstalldirs) $(DESTDIR)$(bindir)
367336
@list='$(bin_PROGRAMS)'; for p in $$list; do \
368-
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
369-
if test -f $$p \
370-
|| test -f $$p1 \
371-
; then \
372-
f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
373-
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
374-
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
375-
else :; fi; \
337+
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
338+
if test -f $$p \
339+
|| test -f $$p1 \
340+
; then \
341+
f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
342+
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
343+
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
344+
else :; fi; \
376345
done
377346

378347
uninstall-binPROGRAMS:
379348
@$(NORMAL_UNINSTALL)
380349
@list='$(bin_PROGRAMS)'; for p in $$list; do \
381-
f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
382-
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
383-
rm -f $(DESTDIR)$(bindir)/$$f; \
350+
f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
351+
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
352+
rm -f $(DESTDIR)$(bindir)/$$f; \
384353
done
385354

386355
clean-binPROGRAMS:
@@ -443,125 +412,120 @@ $(RECURSIVE_TARGETS):
443412
dot_seen=no; \
444413
target=`echo $@ | sed s/-recursive//`; \
445414
list='$(SUBDIRS)'; for subdir in $$list; do \
446-
echo "Making $$target in $$subdir"; \
447-
if test "$$subdir" = "."; then \
448-
dot_seen=yes; \
449-
local_target="$$target-am"; \
450-
else \
451-
local_target="$$target"; \
452-
fi; \
453-
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
454-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
415+
echo "Making $$target in $$subdir"; \
416+
if test "$$subdir" = "."; then \
417+
dot_seen=yes; \
418+
local_target="$$target-am"; \
419+
else \
420+
local_target="$$target"; \
421+
fi; \
422+
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
423+
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
455424
done; \
456425
if test "$$dot_seen" = "no"; then \
457-
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
426+
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
458427
fi; test -z "$$fail"
459428

460429
mostlyclean-recursive clean-recursive distclean-recursive \
461-
maintainer-clean-recursive:
430+
maintainer-clean-recursive:
462431
@set fnord $(MAKEFLAGS); amf=$$2; \
463432
dot_seen=no; \
464433
case "$@" in \
465-
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
466-
*) list='$(SUBDIRS)' ;; \
434+
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
435+
*) list='$(SUBDIRS)' ;; \
467436
esac; \
468437
rev=''; for subdir in $$list; do \
469-
if test "$$subdir" = "."; then :; else \
470-
rev="$$subdir $$rev"; \
471-
fi; \
438+
if test "$$subdir" = "."; then :; else \
439+
rev="$$subdir $$rev"; \
440+
fi; \
472441
done; \
473442
rev="$$rev ."; \
474443
target=`echo $@ | sed s/-recursive//`; \
475444
for subdir in $$rev; do \
476-
echo "Making $$target in $$subdir"; \
477-
if test "$$subdir" = "."; then \
478-
local_target="$$target-am"; \
479-
else \
480-
local_target="$$target"; \
481-
fi; \
482-
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
483-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
445+
echo "Making $$target in $$subdir"; \
446+
if test "$$subdir" = "."; then \
447+
local_target="$$target-am"; \
448+
else \
449+
local_target="$$target"; \
450+
fi; \
451+
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
452+
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
484453
done && test -z "$$fail"
485454
tags-recursive:
486455
list='$(SUBDIRS)'; for subdir in $$list; do \
487-
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
456+
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
488457
done
489458

490459
tags: TAGS
491460

492461
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
493462
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
494463
unique=`for i in $$list; do \
495-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
496-
done | \
497-
$(AWK) ' { files[$$0] = 1; } \
498-
END { for (i in files) print i; }'`; \
464+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
465+
done | \
466+
$(AWK) ' { files[$$0] = 1; } \
467+
END { for (i in files) print i; }'`; \
499468
mkid -fID $$unique $(LISP)
500469

501470
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
502-
$(TAGS_FILES) $(LISP)
471+
$(TAGS_FILES) $(LISP)
503472
tags=; \
504473
here=`pwd`; \
505474
list='$(SUBDIRS)'; for subdir in $$list; do \
506-
if test "$$subdir" = .; then :; else \
507-
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
508-
fi; \
475+
if test "$$subdir" = .; then :; else \
476+
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
477+
fi; \
509478
done; \
510479
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
511480
unique=`for i in $$list; do \
512-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
513-
done | \
514-
$(AWK) ' { files[$$0] = 1; } \
515-
END { for (i in files) print i; }'`; \
481+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
482+
done | \
483+
$(AWK) ' { files[$$0] = 1; } \
484+
END { for (i in files) print i; }'`; \
516485
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
517-
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
486+
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
518487

519488
GTAGS:
520489
here=`CDPATH=: && cd $(top_builddir) && pwd` \
521-
&& cd $(top_srcdir) \
522-
&& gtags -i $(GTAGS_ARGS) $$here
490+
&& cd $(top_srcdir) \
491+
&& gtags -i $(GTAGS_ARGS) $$here
523492

524493
distclean-tags:
525494
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
526495

527-
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
528-
#>+ 4
529-
KDE_DIST=qgsdbsourceselectbase.h qgisappbase.h qgis moc_qgsdbsourceselectbase.cpp moc_qgsmapcanvas.cpp sources.txt qgsnewconnectionbase.h moc_qgisappbase.cpp includes.txt qgisappbase.ui.h qgsdbsourceselectbase.ui.h moc_qgsnewconnectionbase.cpp qgispoint.h
530-
531-
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
532-
496+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
533497

534498
top_distdir = ..
535499
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
536500

537501
distdir: $(DISTFILES)
538502
@for file in $(DISTFILES); do \
539-
if test -f $$file; then d=.; else d=$(srcdir); fi; \
540-
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
541-
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
542-
$(mkinstalldirs) "$(distdir)/$$dir"; \
543-
fi; \
544-
if test -d $$d/$$file; then \
545-
cp -pR $$d/$$file $(distdir) \
546-
|| exit 1; \
547-
else \
548-
test -f $(distdir)/$$file \
549-
|| cp -p $$d/$$file $(distdir)/$$file \
550-
|| exit 1; \
551-
fi; \
503+
if test -f $$file; then d=.; else d=$(srcdir); fi; \
504+
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
505+
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
506+
$(mkinstalldirs) "$(distdir)/$$dir"; \
507+
fi; \
508+
if test -d $$d/$$file; then \
509+
cp -pR $$d/$$file $(distdir) \
510+
|| exit 1; \
511+
else \
512+
test -f $(distdir)/$$file \
513+
|| cp -p $$d/$$file $(distdir)/$$file \
514+
|| exit 1; \
515+
fi; \
552516
done
553517
for subdir in $(SUBDIRS); do \
554-
if test "$$subdir" = .; then :; else \
555-
test -d $(distdir)/$$subdir \
556-
|| mkdir $(distdir)/$$subdir \
557-
|| exit 1; \
558-
(cd $$subdir && \
559-
$(MAKE) $(AM_MAKEFLAGS) \
560-
top_distdir="$(top_distdir)" \
561-
distdir=../$(distdir)/$$subdir \
562-
distdir) \
563-
|| exit 1; \
564-
fi; \
518+
if test "$$subdir" = .; then :; else \
519+
test -d $(distdir)/$$subdir \
520+
|| mkdir $(distdir)/$$subdir \
521+
|| exit 1; \
522+
(cd $$subdir && \
523+
$(MAKE) $(AM_MAKEFLAGS) \
524+
top_distdir="$(top_distdir)" \
525+
distdir=../$(distdir)/$$subdir \
526+
distdir) \
527+
|| exit 1; \
528+
fi; \
565529
done
566530
check-am: all-am
567531
check: check-recursive
@@ -581,8 +545,8 @@ install-am: all-am
581545
installcheck: installcheck-recursive
582546
install-strip:
583547
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
584-
`test -z '$(STRIP)' || \
585-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
548+
`test -z '$(STRIP)' || \
549+
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
586550
mostlyclean-generic:
587551

588552
clean-generic:
@@ -594,13 +558,9 @@ distclean-generic:
594558
maintainer-clean-generic:
595559
@echo "This command is intended for maintainers to use"
596560
@echo "it deletes files that may require special tools to rebuild."
597-
#>- clean: clean-recursive
598-
#>+ 1
599-
clean: kde-rpo-clean clean-recursive
561+
clean: clean-recursive
600562

601-
#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
602-
#>+ 1
603-
clean-am: clean-metasources clean-ui clean-final clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
563+
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
604564

605565
distclean: distclean-recursive
606566

@@ -658,111 +618,3 @@ uninstall-info: uninstall-info-recursive
658618
# Tell versions [3.59,3.63) of GNU make to not export all variables.
659619
# Otherwise a system limit (for SysV at least) may be exceeded.
660620
.NOEXPORT:
661-
662-
#>+ 31
663-
qgsnewconnectionbase.cpp: $(srcdir)/qgsnewconnectionbase.ui qgsnewconnectionbase.h qgsnewconnectionbase.moc
664-
rm -f qgsnewconnectionbase.cpp
665-
$(UIC) -i qgsnewconnectionbase.h $(srcdir)/qgsnewconnectionbase.ui > qgsnewconnectionbase.cpp || rm -f qgsnewconnectionbase.cpp
666-
echo '#include "qgsnewconnectionbase.moc"' >> qgsnewconnectionbase.cpp
667-
668-
qgsnewconnectionbase.h: $(srcdir)/qgsnewconnectionbase.ui
669-
$(UIC) -o qgsnewconnectionbase.h $(srcdir)/qgsnewconnectionbase.ui
670-
671-
qgsnewconnectionbase.moc: qgsnewconnectionbase.h
672-
$(MOC) qgsnewconnectionbase.h -o qgsnewconnectionbase.moc
673-
qgsdbsourceselectbase.cpp: $(srcdir)/qgsdbsourceselectbase.ui qgsdbsourceselectbase.h qgsdbsourceselectbase.moc
674-
rm -f qgsdbsourceselectbase.cpp
675-
$(UIC) -i qgsdbsourceselectbase.h $(srcdir)/qgsdbsourceselectbase.ui > qgsdbsourceselectbase.cpp || rm -f qgsdbsourceselectbase.cpp
676-
echo '#include "qgsdbsourceselectbase.moc"' >> qgsdbsourceselectbase.cpp
677-
678-
qgsdbsourceselectbase.h: $(srcdir)/qgsdbsourceselectbase.ui
679-
$(UIC) -o qgsdbsourceselectbase.h $(srcdir)/qgsdbsourceselectbase.ui
680-
681-
qgsdbsourceselectbase.moc: qgsdbsourceselectbase.h
682-
$(MOC) qgsdbsourceselectbase.h -o qgsdbsourceselectbase.moc
683-
qgisappbase.cpp: $(srcdir)/qgisappbase.ui qgisappbase.h qgisappbase.moc
684-
rm -f qgisappbase.cpp
685-
$(UIC) -i qgisappbase.h $(srcdir)/qgisappbase.ui > qgisappbase.cpp || rm -f qgisappbase.cpp
686-
echo '#include "qgisappbase.moc"' >> qgisappbase.cpp
687-
688-
qgisappbase.h: $(srcdir)/qgisappbase.ui
689-
$(UIC) -o qgisappbase.h $(srcdir)/qgisappbase.ui
690-
691-
qgisappbase.moc: qgisappbase.h
692-
$(MOC) qgisappbase.h -o qgisappbase.moc
693-
694-
#>+ 3
695-
qgsmapcanvas.moc.cpp: $(srcdir)/qgsmapcanvas.h
696-
$(MOC) $(srcdir)/qgsmapcanvas.h -o qgsmapcanvas.moc.cpp
697-
698-
#>+ 3
699-
clean-metasources:
700-
-rm -f qgsmapcanvas.moc.cpp
701-
702-
#>+ 6
703-
clean-ui:
704-
-rm -f \
705-
qgsnewconnectionbase.cpp qgsnewconnectionbase.h qgsnewconnectionbase.moc \
706-
qgsdbsourceselectbase.cpp qgsdbsourceselectbase.h qgsdbsourceselectbase.moc \
707-
qgisappbase.cpp qgisappbase.h qgisappbase.moc
708-
709-
#>+ 2
710-
docs-am:
711-
712-
#>+ 6
713-
force-reedit:
714-
cd $(top_srcdir) && \
715-
$(AUTOMAKE) --gnu qgis/Makefile
716-
cd $(top_srcdir) && perl admin/am_edit qgis/Makefile.in
717-
718-
719-
#>+ 11
720-
qgis.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/qgsrect.cpp $(srcdir)/qgsrasterlayer.cpp $(srcdir)/qgspoint.cpp $(srcdir)/qgsnewconnection.cpp $(srcdir)/qgsmaplayer.cpp $(srcdir)/qgsmapcanvas.cpp $(srcdir)/qgsdbsourceselect.cpp $(srcdir)/qgsdatasource.cpp $(srcdir)/qgsdatabaselayer.cpp $(srcdir)/qgsdatabase.cpp $(srcdir)/qgscoordinatetransform.cpp $(srcdir)/qgisapp.cpp $(srcdir)/main.cpp $(srcdir)/qgsnewconnectionbase.cpp $(srcdir)/qgsdbsourceselectbase.cpp $(srcdir)/qgisappbase.cpp $(srcdir)/qgsmapcanvas.moc.cpp qgsnewconnectionbase.moc qgisappbase.moc qgsdbsourceselectbase.moc
721-
@echo 'creating qgis.all_cpp.cpp ...'; \
722-
rm -f qgis.all_cpp.files qgis.all_cpp.final; \
723-
echo "#define KDE_USE_FINAL 1" >> qgis.all_cpp.final; \
724-
for file in qgsrect.cpp qgsrasterlayer.cpp qgspoint.cpp qgsnewconnection.cpp qgsmaplayer.cpp qgsmapcanvas.cpp qgsdbsourceselect.cpp qgsdatasource.cpp qgsdatabaselayer.cpp qgsdatabase.cpp qgscoordinatetransform.cpp qgisapp.cpp main.cpp qgsnewconnectionbase.cpp qgsdbsourceselectbase.cpp qgisappbase.cpp qgsmapcanvas.moc.cpp; do \
725-
echo "#include \"$$file\"" >> qgis.all_cpp.files; \
726-
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> qgis.all_cpp.final; \
727-
done; \
728-
cat qgis.all_cpp.final qgis.all_cpp.files > qgis.all_cpp.cpp; \
729-
rm -f qgis.all_cpp.final qgis.all_cpp.files
730-
731-
#>+ 3
732-
clean-final:
733-
-rm -f qgis.all_cpp.cpp
734-
735-
#>+ 2
736-
final:
737-
$(MAKE) qgis_OBJECTS="$(qgis_final_OBJECTS)" all-am
738-
#>+ 2
739-
final-install:
740-
$(MAKE) qgis_OBJECTS="$(qgis_final_OBJECTS)" install-am
741-
#>+ 2
742-
no-final:
743-
$(MAKE) qgis_OBJECTS="$(qgis_nofinal_OBJECTS)" all-am
744-
#>+ 2
745-
no-final-install:
746-
$(MAKE) qgis_OBJECTS="$(qgis_nofinal_OBJECTS)" install-am
747-
#>+ 3
748-
cvs-clean:
749-
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
750-
751-
#>+ 3
752-
kde-rpo-clean:
753-
-rm -f *.rpo
754-
755-
#>+ 14
756-
$(srcdir)/qgsdbsourceselect.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
757-
$(srcdir)/qgsnewconnection.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
758-
$(srcdir)/qgsmaplayer.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
759-
$(srcdir)/qgspoint.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
760-
$(srcdir)/qgsrect.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
761-
$(srcdir)/qgsmapcanvas.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
762-
$(srcdir)/qgsrasterlayer.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
763-
$(srcdir)/qgsdatasource.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
764-
$(srcdir)/qgscoordinatetransform.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
765-
$(srcdir)/qgsdatabase.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
766-
$(srcdir)/main.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
767-
$(srcdir)/qgisapp.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h
768-
$(srcdir)/qgsdatabaselayer.cpp: qgsnewconnectionbase.h qgsdbsourceselectbase.h qgisappbase.h

‎docs/Makefile

Lines changed: 80 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
2-
# KDE tags expanded automatically by am_edit - $Revision$
32

43
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
54
# Free Software Foundation, Inc.
@@ -51,27 +50,27 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
5150
INSTALL_DATA = ${INSTALL} -m 644
5251
INSTALL_SCRIPT = ${INSTALL}
5352
INSTALL_HEADER = $(INSTALL_DATA)
54-
transform = s,^,i386-linux-,
53+
transform = s,x,x,
5554
NORMAL_INSTALL = :
5655
PRE_INSTALL = :
5756
POST_INSTALL = :
5857
NORMAL_UNINSTALL = :
5958
PRE_UNINSTALL = :
6059
POST_UNINSTALL = :
61-
build_alias = i386-linux
62-
build_triplet = i386-pc-linux-gnu
63-
host_alias = i386-linux
64-
host_triplet = i386-pc-linux-gnu
65-
target_alias = i386-linux
66-
target_triplet = i386-pc-linux-gnu
60+
build_alias =
61+
build_triplet = i686-pc-linux-gnu
62+
host_alias =
63+
host_triplet = i686-pc-linux-gnu
64+
target_alias =
65+
target_triplet = i686-pc-linux-gnu
6766
AMTAR = ${SHELL} /home/sherman/development/qgis/admin/missing --run tar
6867
ARTSCCONFIG = @ARTSCCONFIG@
6968
AS = @AS@
7069
AUTODIRS = @AUTODIRS@
7170
AWK = gawk
7271
CC = gcc
7372
CONF_FILES = @CONF_FILES@
74-
CPP = cpp
73+
CPP = gcc -E
7574
CXX = g++
7675
CXXCPP = g++ -E
7776
DCOPIDL = @DCOPIDL@
@@ -187,7 +186,7 @@ STRIP = strip
187186
TOPSUBDIRS = autom4te.cache qgis
188187
UIC = /opt/qt3.0.5/bin/uic -L $(kde_widgetdir) -nounload
189188
UIC_TR = tr2i18n
190-
USER_INCLUDES = -I(PGSQL)/include
189+
USER_INCLUDES =
191190
USER_LDFLAGS =
192191
USE_EXCEPTIONS = -fexceptions
193192
USE_RTTI =
@@ -248,9 +247,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
248247
uninstall-recursive check-recursive installcheck-recursive
249248
DIST_COMMON = Makefile.am Makefile.in
250249
DIST_SUBDIRS = $(SUBDIRS)
251-
#>- all: all-recursive
252-
#>+ 1
253-
all: docs-am all-recursive
250+
all: all-recursive
254251

255252
.SUFFIXES:
256253

@@ -263,16 +260,12 @@ clean-libtool:
263260
distclean-libtool:
264261
-rm -f libtool
265262
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
266-
#>- cd $(top_srcdir) && \
267-
#>- $(AUTOMAKE) --gnu qgis/docs/Makefile
268-
#>+ 3
269263
cd $(top_srcdir) && \
270-
$(AUTOMAKE) --gnu qgis/docs/Makefile
271-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/Makefile.in
264+
$(AUTOMAKE) --gnu qgis/docs/Makefile
272265
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
273266
cd $(top_builddir) && \
274-
CONFIG_HEADERS= CONFIG_LINKS= \
275-
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
267+
CONFIG_HEADERS= CONFIG_LINKS= \
268+
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
276269
uninstall-info-am:
277270

278271
# This directory's subdirectories are mostly independent; you can cd
@@ -286,83 +279,83 @@ $(RECURSIVE_TARGETS):
286279
dot_seen=no; \
287280
target=`echo $@ | sed s/-recursive//`; \
288281
list='$(SUBDIRS)'; for subdir in $$list; do \
289-
echo "Making $$target in $$subdir"; \
290-
if test "$$subdir" = "."; then \
291-
dot_seen=yes; \
292-
local_target="$$target-am"; \
293-
else \
294-
local_target="$$target"; \
295-
fi; \
296-
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
297-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
282+
echo "Making $$target in $$subdir"; \
283+
if test "$$subdir" = "."; then \
284+
dot_seen=yes; \
285+
local_target="$$target-am"; \
286+
else \
287+
local_target="$$target"; \
288+
fi; \
289+
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
290+
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
298291
done; \
299292
if test "$$dot_seen" = "no"; then \
300-
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
293+
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
301294
fi; test -z "$$fail"
302295

303296
mostlyclean-recursive clean-recursive distclean-recursive \
304-
maintainer-clean-recursive:
297+
maintainer-clean-recursive:
305298
@set fnord $(MAKEFLAGS); amf=$$2; \
306299
dot_seen=no; \
307300
case "$@" in \
308-
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
309-
*) list='$(SUBDIRS)' ;; \
301+
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
302+
*) list='$(SUBDIRS)' ;; \
310303
esac; \
311304
rev=''; for subdir in $$list; do \
312-
if test "$$subdir" = "."; then :; else \
313-
rev="$$subdir $$rev"; \
314-
fi; \
305+
if test "$$subdir" = "."; then :; else \
306+
rev="$$subdir $$rev"; \
307+
fi; \
315308
done; \
316309
rev="$$rev ."; \
317310
target=`echo $@ | sed s/-recursive//`; \
318311
for subdir in $$rev; do \
319-
echo "Making $$target in $$subdir"; \
320-
if test "$$subdir" = "."; then \
321-
local_target="$$target-am"; \
322-
else \
323-
local_target="$$target"; \
324-
fi; \
325-
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
326-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
312+
echo "Making $$target in $$subdir"; \
313+
if test "$$subdir" = "."; then \
314+
local_target="$$target-am"; \
315+
else \
316+
local_target="$$target"; \
317+
fi; \
318+
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
319+
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
327320
done && test -z "$$fail"
328321
tags-recursive:
329322
list='$(SUBDIRS)'; for subdir in $$list; do \
330-
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
323+
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
331324
done
332325

333326
tags: TAGS
334327

335328
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
336329
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
337330
unique=`for i in $$list; do \
338-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
339-
done | \
340-
$(AWK) ' { files[$$0] = 1; } \
341-
END { for (i in files) print i; }'`; \
331+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
332+
done | \
333+
$(AWK) ' { files[$$0] = 1; } \
334+
END { for (i in files) print i; }'`; \
342335
mkid -fID $$unique $(LISP)
343336

344337
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
345-
$(TAGS_FILES) $(LISP)
338+
$(TAGS_FILES) $(LISP)
346339
tags=; \
347340
here=`pwd`; \
348341
list='$(SUBDIRS)'; for subdir in $$list; do \
349-
if test "$$subdir" = .; then :; else \
350-
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
351-
fi; \
342+
if test "$$subdir" = .; then :; else \
343+
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
344+
fi; \
352345
done; \
353346
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
354347
unique=`for i in $$list; do \
355-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
356-
done | \
357-
$(AWK) ' { files[$$0] = 1; } \
358-
END { for (i in files) print i; }'`; \
348+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
349+
done | \
350+
$(AWK) ' { files[$$0] = 1; } \
351+
END { for (i in files) print i; }'`; \
359352
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
360-
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
353+
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
361354

362355
GTAGS:
363356
here=`CDPATH=: && cd $(top_builddir) && pwd` \
364-
&& cd $(top_srcdir) \
365-
&& gtags -i $(GTAGS_ARGS) $$here
357+
&& cd $(top_srcdir) \
358+
&& gtags -i $(GTAGS_ARGS) $$here
366359

367360
distclean-tags:
368361
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
@@ -374,32 +367,32 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
374367

375368
distdir: $(DISTFILES)
376369
@for file in $(DISTFILES); do \
377-
if test -f $$file; then d=.; else d=$(srcdir); fi; \
378-
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
379-
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
380-
$(mkinstalldirs) "$(distdir)/$$dir"; \
381-
fi; \
382-
if test -d $$d/$$file; then \
383-
cp -pR $$d/$$file $(distdir) \
384-
|| exit 1; \
385-
else \
386-
test -f $(distdir)/$$file \
387-
|| cp -p $$d/$$file $(distdir)/$$file \
388-
|| exit 1; \
389-
fi; \
370+
if test -f $$file; then d=.; else d=$(srcdir); fi; \
371+
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
372+
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
373+
$(mkinstalldirs) "$(distdir)/$$dir"; \
374+
fi; \
375+
if test -d $$d/$$file; then \
376+
cp -pR $$d/$$file $(distdir) \
377+
|| exit 1; \
378+
else \
379+
test -f $(distdir)/$$file \
380+
|| cp -p $$d/$$file $(distdir)/$$file \
381+
|| exit 1; \
382+
fi; \
390383
done
391384
for subdir in $(SUBDIRS); do \
392-
if test "$$subdir" = .; then :; else \
393-
test -d $(distdir)/$$subdir \
394-
|| mkdir $(distdir)/$$subdir \
395-
|| exit 1; \
396-
(cd $$subdir && \
397-
$(MAKE) $(AM_MAKEFLAGS) \
398-
top_distdir="$(top_distdir)" \
399-
distdir=../$(distdir)/$$subdir \
400-
distdir) \
401-
|| exit 1; \
402-
fi; \
385+
if test "$$subdir" = .; then :; else \
386+
test -d $(distdir)/$$subdir \
387+
|| mkdir $(distdir)/$$subdir \
388+
|| exit 1; \
389+
(cd $$subdir && \
390+
$(MAKE) $(AM_MAKEFLAGS) \
391+
top_distdir="$(top_distdir)" \
392+
distdir=../$(distdir)/$$subdir \
393+
distdir) \
394+
|| exit 1; \
395+
fi; \
403396
done
404397
check-am: all-am
405398
check: check-recursive
@@ -418,8 +411,8 @@ install-am: all-am
418411
installcheck: installcheck-recursive
419412
install-strip:
420413
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
421-
`test -z '$(STRIP)' || \
422-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
414+
`test -z '$(STRIP)' || \
415+
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
423416
mostlyclean-generic:
424417

425418
clean-generic:
@@ -430,9 +423,7 @@ distclean-generic:
430423
maintainer-clean-generic:
431424
@echo "This command is intended for maintainers to use"
432425
@echo "it deletes files that may require special tools to rebuild."
433-
#>- clean: clean-recursive
434-
#>+ 1
435-
clean: kde-rpo-clean clean-recursive
426+
clean: clean-recursive
436427

437428
clean-am: clean-generic clean-libtool mostlyclean-am
438429

@@ -491,33 +482,3 @@ uninstall-info: uninstall-info-recursive
491482
# Tell versions [3.59,3.63) of GNU make to not export all variables.
492483
# Otherwise a system limit (for SysV at least) may be exceeded.
493484
.NOEXPORT:
494-
495-
#>+ 2
496-
docs-am:
497-
498-
#>+ 6
499-
force-reedit:
500-
cd $(top_srcdir) && \
501-
$(AUTOMAKE) --gnu qgis/docs/Makefile
502-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/Makefile.in
503-
504-
505-
#>+ 2
506-
final:
507-
$(MAKE) all-am
508-
#>+ 2
509-
final-install:
510-
$(MAKE) install-am
511-
#>+ 2
512-
no-final:
513-
$(MAKE) all-am
514-
#>+ 2
515-
no-final-install:
516-
$(MAKE) install-am
517-
#>+ 3
518-
cvs-clean:
519-
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
520-
521-
#>+ 3
522-
kde-rpo-clean:
523-
-rm -f *.rpo

‎docs/Makefile.in

Lines changed: 71 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
2-
# KDE tags expanded automatically by am_edit - $Revision$
32

43
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
54
# Free Software Foundation, Inc.
@@ -248,9 +247,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
248247
uninstall-recursive check-recursive installcheck-recursive
249248
DIST_COMMON = Makefile.am Makefile.in
250249
DIST_SUBDIRS = $(SUBDIRS)
251-
#>- all: all-recursive
252-
#>+ 1
253-
all: docs-am all-recursive
250+
all: all-recursive
254251

255252
.SUFFIXES:
256253

@@ -263,16 +260,12 @@ clean-libtool:
263260
distclean-libtool:
264261
-rm -f libtool
265262
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
266-
#>- cd $(top_srcdir) && \
267-
#>- $(AUTOMAKE) --gnu qgis/docs/Makefile
268-
#>+ 3
269263
cd $(top_srcdir) && \
270-
$(AUTOMAKE) --gnu qgis/docs/Makefile
271-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/Makefile.in
264+
$(AUTOMAKE) --gnu qgis/docs/Makefile
272265
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
273266
cd $(top_builddir) && \
274-
CONFIG_HEADERS= CONFIG_LINKS= \
275-
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
267+
CONFIG_HEADERS= CONFIG_LINKS= \
268+
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
276269
uninstall-info-am:
277270

278271
# This directory's subdirectories are mostly independent; you can cd
@@ -286,83 +279,83 @@ $(RECURSIVE_TARGETS):
286279
dot_seen=no; \
287280
target=`echo $@ | sed s/-recursive//`; \
288281
list='$(SUBDIRS)'; for subdir in $$list; do \
289-
echo "Making $$target in $$subdir"; \
290-
if test "$$subdir" = "."; then \
291-
dot_seen=yes; \
292-
local_target="$$target-am"; \
293-
else \
294-
local_target="$$target"; \
295-
fi; \
296-
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
297-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
282+
echo "Making $$target in $$subdir"; \
283+
if test "$$subdir" = "."; then \
284+
dot_seen=yes; \
285+
local_target="$$target-am"; \
286+
else \
287+
local_target="$$target"; \
288+
fi; \
289+
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
290+
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
298291
done; \
299292
if test "$$dot_seen" = "no"; then \
300-
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
293+
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
301294
fi; test -z "$$fail"
302295

303296
mostlyclean-recursive clean-recursive distclean-recursive \
304-
maintainer-clean-recursive:
297+
maintainer-clean-recursive:
305298
@set fnord $(MAKEFLAGS); amf=$$2; \
306299
dot_seen=no; \
307300
case "$@" in \
308-
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
309-
*) list='$(SUBDIRS)' ;; \
301+
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
302+
*) list='$(SUBDIRS)' ;; \
310303
esac; \
311304
rev=''; for subdir in $$list; do \
312-
if test "$$subdir" = "."; then :; else \
313-
rev="$$subdir $$rev"; \
314-
fi; \
305+
if test "$$subdir" = "."; then :; else \
306+
rev="$$subdir $$rev"; \
307+
fi; \
315308
done; \
316309
rev="$$rev ."; \
317310
target=`echo $@ | sed s/-recursive//`; \
318311
for subdir in $$rev; do \
319-
echo "Making $$target in $$subdir"; \
320-
if test "$$subdir" = "."; then \
321-
local_target="$$target-am"; \
322-
else \
323-
local_target="$$target"; \
324-
fi; \
325-
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
326-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
312+
echo "Making $$target in $$subdir"; \
313+
if test "$$subdir" = "."; then \
314+
local_target="$$target-am"; \
315+
else \
316+
local_target="$$target"; \
317+
fi; \
318+
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
319+
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
327320
done && test -z "$$fail"
328321
tags-recursive:
329322
list='$(SUBDIRS)'; for subdir in $$list; do \
330-
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
323+
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
331324
done
332325

333326
tags: TAGS
334327

335328
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
336329
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
337330
unique=`for i in $$list; do \
338-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
339-
done | \
340-
$(AWK) ' { files[$$0] = 1; } \
341-
END { for (i in files) print i; }'`; \
331+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
332+
done | \
333+
$(AWK) ' { files[$$0] = 1; } \
334+
END { for (i in files) print i; }'`; \
342335
mkid -fID $$unique $(LISP)
343336

344337
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
345-
$(TAGS_FILES) $(LISP)
338+
$(TAGS_FILES) $(LISP)
346339
tags=; \
347340
here=`pwd`; \
348341
list='$(SUBDIRS)'; for subdir in $$list; do \
349-
if test "$$subdir" = .; then :; else \
350-
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
351-
fi; \
342+
if test "$$subdir" = .; then :; else \
343+
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
344+
fi; \
352345
done; \
353346
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
354347
unique=`for i in $$list; do \
355-
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
356-
done | \
357-
$(AWK) ' { files[$$0] = 1; } \
358-
END { for (i in files) print i; }'`; \
348+
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
349+
done | \
350+
$(AWK) ' { files[$$0] = 1; } \
351+
END { for (i in files) print i; }'`; \
359352
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
360-
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
353+
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
361354

362355
GTAGS:
363356
here=`CDPATH=: && cd $(top_builddir) && pwd` \
364-
&& cd $(top_srcdir) \
365-
&& gtags -i $(GTAGS_ARGS) $$here
357+
&& cd $(top_srcdir) \
358+
&& gtags -i $(GTAGS_ARGS) $$here
366359

367360
distclean-tags:
368361
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
@@ -374,32 +367,32 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
374367

375368
distdir: $(DISTFILES)
376369
@for file in $(DISTFILES); do \
377-
if test -f $$file; then d=.; else d=$(srcdir); fi; \
378-
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
379-
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
380-
$(mkinstalldirs) "$(distdir)/$$dir"; \
381-
fi; \
382-
if test -d $$d/$$file; then \
383-
cp -pR $$d/$$file $(distdir) \
384-
|| exit 1; \
385-
else \
386-
test -f $(distdir)/$$file \
387-
|| cp -p $$d/$$file $(distdir)/$$file \
388-
|| exit 1; \
389-
fi; \
370+
if test -f $$file; then d=.; else d=$(srcdir); fi; \
371+
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
372+
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
373+
$(mkinstalldirs) "$(distdir)/$$dir"; \
374+
fi; \
375+
if test -d $$d/$$file; then \
376+
cp -pR $$d/$$file $(distdir) \
377+
|| exit 1; \
378+
else \
379+
test -f $(distdir)/$$file \
380+
|| cp -p $$d/$$file $(distdir)/$$file \
381+
|| exit 1; \
382+
fi; \
390383
done
391384
for subdir in $(SUBDIRS); do \
392-
if test "$$subdir" = .; then :; else \
393-
test -d $(distdir)/$$subdir \
394-
|| mkdir $(distdir)/$$subdir \
395-
|| exit 1; \
396-
(cd $$subdir && \
397-
$(MAKE) $(AM_MAKEFLAGS) \
398-
top_distdir="$(top_distdir)" \
399-
distdir=../$(distdir)/$$subdir \
400-
distdir) \
401-
|| exit 1; \
402-
fi; \
385+
if test "$$subdir" = .; then :; else \
386+
test -d $(distdir)/$$subdir \
387+
|| mkdir $(distdir)/$$subdir \
388+
|| exit 1; \
389+
(cd $$subdir && \
390+
$(MAKE) $(AM_MAKEFLAGS) \
391+
top_distdir="$(top_distdir)" \
392+
distdir=../$(distdir)/$$subdir \
393+
distdir) \
394+
|| exit 1; \
395+
fi; \
403396
done
404397
check-am: all-am
405398
check: check-recursive
@@ -418,8 +411,8 @@ install-am: all-am
418411
installcheck: installcheck-recursive
419412
install-strip:
420413
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
421-
`test -z '$(STRIP)' || \
422-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
414+
`test -z '$(STRIP)' || \
415+
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
423416
mostlyclean-generic:
424417

425418
clean-generic:
@@ -430,9 +423,7 @@ distclean-generic:
430423
maintainer-clean-generic:
431424
@echo "This command is intended for maintainers to use"
432425
@echo "it deletes files that may require special tools to rebuild."
433-
#>- clean: clean-recursive
434-
#>+ 1
435-
clean: kde-rpo-clean clean-recursive
426+
clean: clean-recursive
436427

437428
clean-am: clean-generic clean-libtool mostlyclean-am
438429

@@ -491,33 +482,3 @@ uninstall-info: uninstall-info-recursive
491482
# Tell versions [3.59,3.63) of GNU make to not export all variables.
492483
# Otherwise a system limit (for SysV at least) may be exceeded.
493484
.NOEXPORT:
494-
495-
#>+ 2
496-
docs-am:
497-
498-
#>+ 6
499-
force-reedit:
500-
cd $(top_srcdir) && \
501-
$(AUTOMAKE) --gnu qgis/docs/Makefile
502-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/Makefile.in
503-
504-
505-
#>+ 2
506-
final:
507-
$(MAKE) all-am
508-
#>+ 2
509-
final-install:
510-
$(MAKE) install-am
511-
#>+ 2
512-
no-final:
513-
$(MAKE) all-am
514-
#>+ 2
515-
no-final-install:
516-
$(MAKE) install-am
517-
#>+ 3
518-
cvs-clean:
519-
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
520-
521-
#>+ 3
522-
kde-rpo-clean:
523-
-rm -f *.rpo

‎docs/en/Makefile

Lines changed: 51 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
2-
# KDE tags expanded automatically by am_edit - $Revision$
32

43
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
54
# Free Software Foundation, Inc.
@@ -51,27 +50,27 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
5150
INSTALL_DATA = ${INSTALL} -m 644
5251
INSTALL_SCRIPT = ${INSTALL}
5352
INSTALL_HEADER = $(INSTALL_DATA)
54-
transform = s,^,i386-linux-,
53+
transform = s,x,x,
5554
NORMAL_INSTALL = :
5655
PRE_INSTALL = :
5756
POST_INSTALL = :
5857
NORMAL_UNINSTALL = :
5958
PRE_UNINSTALL = :
6059
POST_UNINSTALL = :
61-
build_alias = i386-linux
62-
build_triplet = i386-pc-linux-gnu
63-
host_alias = i386-linux
64-
host_triplet = i386-pc-linux-gnu
65-
target_alias = i386-linux
66-
target_triplet = i386-pc-linux-gnu
60+
build_alias =
61+
build_triplet = i686-pc-linux-gnu
62+
host_alias =
63+
host_triplet = i686-pc-linux-gnu
64+
target_alias =
65+
target_triplet = i686-pc-linux-gnu
6766
AMTAR = ${SHELL} /home/sherman/development/qgis/admin/missing --run tar
6867
ARTSCCONFIG = @ARTSCCONFIG@
6968
AS = @AS@
7069
AUTODIRS = @AUTODIRS@
7170
AWK = gawk
7271
CC = gcc
7372
CONF_FILES = @CONF_FILES@
74-
CPP = cpp
73+
CPP = gcc -E
7574
CXX = g++
7675
CXXCPP = g++ -E
7776
DCOPIDL = @DCOPIDL@
@@ -187,7 +186,7 @@ STRIP = strip
187186
TOPSUBDIRS = autom4te.cache qgis
188187
UIC = /opt/qt3.0.5/bin/uic -L $(kde_widgetdir) -nounload
189188
UIC_TR = tr2i18n
190-
USER_INCLUDES = -I(PGSQL)/include
189+
USER_INCLUDES =
191190
USER_LDFLAGS =
192191
USE_EXCEPTIONS = -fexceptions
193192
USE_RTTI =
@@ -242,9 +241,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
242241
CONFIG_CLEAN_FILES =
243242
DIST_SOURCES =
244243
DIST_COMMON = Makefile.am Makefile.in
245-
#>- all: all-am
246-
#>+ 1
247-
all: docs-am all-am
244+
all: all-am
248245

249246
.SUFFIXES:
250247

@@ -257,46 +254,37 @@ clean-libtool:
257254
distclean-libtool:
258255
-rm -f libtool
259256
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
260-
#>- cd $(top_srcdir) && \
261-
#>- $(AUTOMAKE) --gnu qgis/docs/en/Makefile
262-
#>+ 3
263257
cd $(top_srcdir) && \
264-
$(AUTOMAKE) --gnu qgis/docs/en/Makefile
265-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/en/Makefile.in
258+
$(AUTOMAKE) --gnu qgis/docs/en/Makefile
266259
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
267260
cd $(top_builddir) && \
268-
CONFIG_HEADERS= CONFIG_LINKS= \
269-
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
261+
CONFIG_HEADERS= CONFIG_LINKS= \
262+
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
270263
uninstall-info-am:
271264
tags: TAGS
272265
TAGS:
273266

274267

275-
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
276-
#>+ 4
277-
KDE_DIST=index.sgml
278-
279-
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
280-
268+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
281269

282270
top_distdir = ../../..
283271
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
284272

285273
distdir: $(DISTFILES)
286274
@for file in $(DISTFILES); do \
287-
if test -f $$file; then d=.; else d=$(srcdir); fi; \
288-
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
289-
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
290-
$(mkinstalldirs) "$(distdir)/$$dir"; \
291-
fi; \
292-
if test -d $$d/$$file; then \
293-
cp -pR $$d/$$file $(distdir) \
294-
|| exit 1; \
295-
else \
296-
test -f $(distdir)/$$file \
297-
|| cp -p $$d/$$file $(distdir)/$$file \
298-
|| exit 1; \
299-
fi; \
275+
if test -f $$file; then d=.; else d=$(srcdir); fi; \
276+
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
277+
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
278+
$(mkinstalldirs) "$(distdir)/$$dir"; \
279+
fi; \
280+
if test -d $$d/$$file; then \
281+
cp -pR $$d/$$file $(distdir) \
282+
|| exit 1; \
283+
else \
284+
test -f $(distdir)/$$file \
285+
|| cp -p $$d/$$file $(distdir)/$$file \
286+
|| exit 1; \
287+
fi; \
300288
done
301289
check-am: all-am
302290
check: check-am
@@ -315,8 +303,8 @@ install-am: all-am
315303
installcheck: installcheck-am
316304
install-strip:
317305
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
318-
`test -z '$(STRIP)' || \
319-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
306+
`test -z '$(STRIP)' || \
307+
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
320308
mostlyclean-generic:
321309

322310
clean-generic:
@@ -327,9 +315,7 @@ distclean-generic:
327315
maintainer-clean-generic:
328316
@echo "This command is intended for maintainers to use"
329317
@echo "it deletes files that may require special tools to rebuild."
330-
#>- clean: clean-am
331-
#>+ 1
332-
clean: kde-rpo-clean clean-am
318+
clean: clean-am
333319

334320
clean-am: clean-generic clean-libtool mostlyclean-am
335321

@@ -377,103 +363,31 @@ uninstall-am: uninstall-info-am uninstall-local
377363

378364

379365
install-data-local:
380-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
381-
#>+ 1
382-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
383-
#>- $(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
384-
#>+ 1
385-
$(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(prefix)/doc/qgis/index.html
386-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
387-
#>+ 1
388-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
389-
#>- $(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
390-
#>+ 1
391-
$(INSTALL_DATA) $(srcdir)/index-1.html $(DESTDIR)$(prefix)/doc/qgis/index-1.html
392-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
393-
#>+ 1
394-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
395-
#>- $(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
396-
#>+ 1
397-
$(INSTALL_DATA) $(srcdir)/index-2.html $(DESTDIR)$(prefix)/doc/qgis/index-2.html
398-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
399-
#>+ 1
400-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
401-
#>- $(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
402-
#>+ 1
403-
$(INSTALL_DATA) $(srcdir)/index-3.html $(DESTDIR)$(prefix)/doc/qgis/index-3.html
404-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
405-
#>+ 1
406-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
407-
#>- $(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
408-
#>+ 1
409-
$(INSTALL_DATA) $(srcdir)/index-4.html $(DESTDIR)$(prefix)/doc/qgis/index-4.html
410-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
411-
#>+ 1
412-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
413-
#>- $(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
414-
#>+ 1
415-
$(INSTALL_DATA) $(srcdir)/index-5.html $(DESTDIR)$(prefix)/doc/qgis/index-5.html
416-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
417-
#>+ 1
418-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
419-
#>- $(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
420-
#>+ 1
421-
$(INSTALL_DATA) $(srcdir)/index-6.html $(DESTDIR)$(prefix)/doc/qgis/index-6.html
366+
$(mkinstalldirs) $(prefix)/doc/qgis/
367+
$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
368+
$(mkinstalldirs) $(prefix)/doc/qgis/
369+
$(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
370+
$(mkinstalldirs) $(prefix)/doc/qgis/
371+
$(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
372+
$(mkinstalldirs) $(prefix)/doc/qgis/
373+
$(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
374+
$(mkinstalldirs) $(prefix)/doc/qgis/
375+
$(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
376+
$(mkinstalldirs) $(prefix)/doc/qgis/
377+
$(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
378+
$(mkinstalldirs) $(prefix)/doc/qgis/
379+
$(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
422380

423381
uninstall-local:
424-
#>- -rm -f $(prefix)/doc/qgis/index.html
425-
#>+ 1
426-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index.html
427-
#>- -rm -f $(prefix)/doc/qgis/index-1.html
428-
#>+ 1
429-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-1.html
430-
#>- -rm -f $(prefix)/doc/qgis/index-2.html
431-
#>+ 1
432-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-2.html
433-
#>- -rm -f $(prefix)/doc/qgis/index-3.html
434-
#>+ 1
435-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-3.html
436-
#>- -rm -f $(prefix)/doc/qgis/index-4.html
437-
#>+ 1
438-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-4.html
439-
#>- -rm -f $(prefix)/doc/qgis/index-5.html
440-
#>+ 1
441-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-5.html
442-
#>- -rm -f $(prefix)/doc/qgis/index-6.html
443-
#>+ 1
444-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-6.html
382+
-rm -f $(prefix)/doc/qgis/index.html
383+
-rm -f $(prefix)/doc/qgis/index-1.html
384+
-rm -f $(prefix)/doc/qgis/index-2.html
385+
-rm -f $(prefix)/doc/qgis/index-3.html
386+
-rm -f $(prefix)/doc/qgis/index-4.html
387+
-rm -f $(prefix)/doc/qgis/index-5.html
388+
-rm -f $(prefix)/doc/qgis/index-6.html
445389

446390
####### kdevelop will overwrite this part!!! (end)############
447391
# Tell versions [3.59,3.63) of GNU make to not export all variables.
448392
# Otherwise a system limit (for SysV at least) may be exceeded.
449393
.NOEXPORT:
450-
451-
#>+ 2
452-
docs-am:
453-
454-
#>+ 6
455-
force-reedit:
456-
cd $(top_srcdir) && \
457-
$(AUTOMAKE) --gnu qgis/docs/en/Makefile
458-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/en/Makefile.in
459-
460-
461-
#>+ 2
462-
final:
463-
$(MAKE) all-am
464-
#>+ 2
465-
final-install:
466-
$(MAKE) install-am
467-
#>+ 2
468-
no-final:
469-
$(MAKE) all-am
470-
#>+ 2
471-
no-final-install:
472-
$(MAKE) install-am
473-
#>+ 3
474-
cvs-clean:
475-
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
476-
477-
#>+ 3
478-
kde-rpo-clean:
479-
-rm -f *.rpo

‎docs/en/Makefile.in

Lines changed: 42 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
2-
# KDE tags expanded automatically by am_edit - $Revision$
32

43
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
54
# Free Software Foundation, Inc.
@@ -242,9 +241,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
242241
CONFIG_CLEAN_FILES =
243242
DIST_SOURCES =
244243
DIST_COMMON = Makefile.am Makefile.in
245-
#>- all: all-am
246-
#>+ 1
247-
all: docs-am all-am
244+
all: all-am
248245

249246
.SUFFIXES:
250247

@@ -257,46 +254,37 @@ clean-libtool:
257254
distclean-libtool:
258255
-rm -f libtool
259256
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
260-
#>- cd $(top_srcdir) && \
261-
#>- $(AUTOMAKE) --gnu qgis/docs/en/Makefile
262-
#>+ 3
263257
cd $(top_srcdir) && \
264-
$(AUTOMAKE) --gnu qgis/docs/en/Makefile
265-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/en/Makefile.in
258+
$(AUTOMAKE) --gnu qgis/docs/en/Makefile
266259
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
267260
cd $(top_builddir) && \
268-
CONFIG_HEADERS= CONFIG_LINKS= \
269-
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
261+
CONFIG_HEADERS= CONFIG_LINKS= \
262+
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
270263
uninstall-info-am:
271264
tags: TAGS
272265
TAGS:
273266

274267

275-
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
276-
#>+ 4
277-
KDE_DIST=index.sgml
278-
279-
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
280-
268+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
281269

282270
top_distdir = ../../..
283271
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
284272

285273
distdir: $(DISTFILES)
286274
@for file in $(DISTFILES); do \
287-
if test -f $$file; then d=.; else d=$(srcdir); fi; \
288-
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
289-
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
290-
$(mkinstalldirs) "$(distdir)/$$dir"; \
291-
fi; \
292-
if test -d $$d/$$file; then \
293-
cp -pR $$d/$$file $(distdir) \
294-
|| exit 1; \
295-
else \
296-
test -f $(distdir)/$$file \
297-
|| cp -p $$d/$$file $(distdir)/$$file \
298-
|| exit 1; \
299-
fi; \
275+
if test -f $$file; then d=.; else d=$(srcdir); fi; \
276+
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
277+
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
278+
$(mkinstalldirs) "$(distdir)/$$dir"; \
279+
fi; \
280+
if test -d $$d/$$file; then \
281+
cp -pR $$d/$$file $(distdir) \
282+
|| exit 1; \
283+
else \
284+
test -f $(distdir)/$$file \
285+
|| cp -p $$d/$$file $(distdir)/$$file \
286+
|| exit 1; \
287+
fi; \
300288
done
301289
check-am: all-am
302290
check: check-am
@@ -315,8 +303,8 @@ install-am: all-am
315303
installcheck: installcheck-am
316304
install-strip:
317305
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
318-
`test -z '$(STRIP)' || \
319-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
306+
`test -z '$(STRIP)' || \
307+
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
320308
mostlyclean-generic:
321309

322310
clean-generic:
@@ -327,9 +315,7 @@ distclean-generic:
327315
maintainer-clean-generic:
328316
@echo "This command is intended for maintainers to use"
329317
@echo "it deletes files that may require special tools to rebuild."
330-
#>- clean: clean-am
331-
#>+ 1
332-
clean: kde-rpo-clean clean-am
318+
clean: clean-am
333319

334320
clean-am: clean-generic clean-libtool mostlyclean-am
335321

@@ -377,103 +363,31 @@ uninstall-am: uninstall-info-am uninstall-local
377363

378364

379365
install-data-local:
380-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
381-
#>+ 1
382-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
383-
#>- $(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
384-
#>+ 1
385-
$(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(prefix)/doc/qgis/index.html
386-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
387-
#>+ 1
388-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
389-
#>- $(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
390-
#>+ 1
391-
$(INSTALL_DATA) $(srcdir)/index-1.html $(DESTDIR)$(prefix)/doc/qgis/index-1.html
392-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
393-
#>+ 1
394-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
395-
#>- $(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
396-
#>+ 1
397-
$(INSTALL_DATA) $(srcdir)/index-2.html $(DESTDIR)$(prefix)/doc/qgis/index-2.html
398-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
399-
#>+ 1
400-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
401-
#>- $(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
402-
#>+ 1
403-
$(INSTALL_DATA) $(srcdir)/index-3.html $(DESTDIR)$(prefix)/doc/qgis/index-3.html
404-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
405-
#>+ 1
406-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
407-
#>- $(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
408-
#>+ 1
409-
$(INSTALL_DATA) $(srcdir)/index-4.html $(DESTDIR)$(prefix)/doc/qgis/index-4.html
410-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
411-
#>+ 1
412-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
413-
#>- $(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
414-
#>+ 1
415-
$(INSTALL_DATA) $(srcdir)/index-5.html $(DESTDIR)$(prefix)/doc/qgis/index-5.html
416-
#>- $(mkinstalldirs) $(prefix)/doc/qgis/
417-
#>+ 1
418-
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/qgis/
419-
#>- $(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
420-
#>+ 1
421-
$(INSTALL_DATA) $(srcdir)/index-6.html $(DESTDIR)$(prefix)/doc/qgis/index-6.html
366+
$(mkinstalldirs) $(prefix)/doc/qgis/
367+
$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/doc/qgis/index.html
368+
$(mkinstalldirs) $(prefix)/doc/qgis/
369+
$(INSTALL_DATA) $(srcdir)/index-1.html $(prefix)/doc/qgis/index-1.html
370+
$(mkinstalldirs) $(prefix)/doc/qgis/
371+
$(INSTALL_DATA) $(srcdir)/index-2.html $(prefix)/doc/qgis/index-2.html
372+
$(mkinstalldirs) $(prefix)/doc/qgis/
373+
$(INSTALL_DATA) $(srcdir)/index-3.html $(prefix)/doc/qgis/index-3.html
374+
$(mkinstalldirs) $(prefix)/doc/qgis/
375+
$(INSTALL_DATA) $(srcdir)/index-4.html $(prefix)/doc/qgis/index-4.html
376+
$(mkinstalldirs) $(prefix)/doc/qgis/
377+
$(INSTALL_DATA) $(srcdir)/index-5.html $(prefix)/doc/qgis/index-5.html
378+
$(mkinstalldirs) $(prefix)/doc/qgis/
379+
$(INSTALL_DATA) $(srcdir)/index-6.html $(prefix)/doc/qgis/index-6.html
422380

423381
uninstall-local:
424-
#>- -rm -f $(prefix)/doc/qgis/index.html
425-
#>+ 1
426-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index.html
427-
#>- -rm -f $(prefix)/doc/qgis/index-1.html
428-
#>+ 1
429-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-1.html
430-
#>- -rm -f $(prefix)/doc/qgis/index-2.html
431-
#>+ 1
432-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-2.html
433-
#>- -rm -f $(prefix)/doc/qgis/index-3.html
434-
#>+ 1
435-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-3.html
436-
#>- -rm -f $(prefix)/doc/qgis/index-4.html
437-
#>+ 1
438-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-4.html
439-
#>- -rm -f $(prefix)/doc/qgis/index-5.html
440-
#>+ 1
441-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-5.html
442-
#>- -rm -f $(prefix)/doc/qgis/index-6.html
443-
#>+ 1
444-
-rm -f $(DESTDIR)$(prefix)/doc/qgis/index-6.html
382+
-rm -f $(prefix)/doc/qgis/index.html
383+
-rm -f $(prefix)/doc/qgis/index-1.html
384+
-rm -f $(prefix)/doc/qgis/index-2.html
385+
-rm -f $(prefix)/doc/qgis/index-3.html
386+
-rm -f $(prefix)/doc/qgis/index-4.html
387+
-rm -f $(prefix)/doc/qgis/index-5.html
388+
-rm -f $(prefix)/doc/qgis/index-6.html
445389

446390
####### kdevelop will overwrite this part!!! (end)############
447391
# Tell versions [3.59,3.63) of GNU make to not export all variables.
448392
# Otherwise a system limit (for SysV at least) may be exceeded.
449393
.NOEXPORT:
450-
451-
#>+ 2
452-
docs-am:
453-
454-
#>+ 6
455-
force-reedit:
456-
cd $(top_srcdir) && \
457-
$(AUTOMAKE) --gnu qgis/docs/en/Makefile
458-
cd $(top_srcdir) && perl admin/am_edit qgis/docs/en/Makefile.in
459-
460-
461-
#>+ 2
462-
final:
463-
$(MAKE) all-am
464-
#>+ 2
465-
final-install:
466-
$(MAKE) install-am
467-
#>+ 2
468-
no-final:
469-
$(MAKE) all-am
470-
#>+ 2
471-
no-final-install:
472-
$(MAKE) install-am
473-
#>+ 3
474-
cvs-clean:
475-
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
476-
477-
#>+ 3
478-
kde-rpo-clean:
479-
-rm -f *.rpo

0 commit comments

Comments
 (0)
Please sign in to comment.