Menu
▾
▴
navit-cvs-commit
|
From: <ho...@us...> - 2008-07-30 13:03:09
|
Revision: 1235
http://navit.svn.sourceforge.net/navit/?rev=1235&view=rev
Author: horwitz
Date: 2008-07-30 13:03:17 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Core:Fix:reorder library parameters and add --as-needed
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-07-29 15:37:45 UTC (rev 1234)
+++ trunk/navit/navit/Makefile.am 2008-07-30 13:03:17 UTC (rev 1235)
@@ -26,11 +26,11 @@
transform.h track.h util.h vehicle.h window.h xmlconfig.h zipfile.h
navit_SOURCES = start.c
-navit_LDADD = @NAVIT_LIBS@ @ZLIB_LIBS@ libnavit.la -Lfib-1.1 -lfib
+navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ -Lfib-1.1 -lfib
osm2navit_CPPFLAGS = $(AM_CPPFLAGS) @POSTGRESQL_CFLAGS@
osm2navit_SOURCES = osm2navit.c
-osm2navit_LDADD = @NAVIT_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@ libnavit.la
+osm2navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@
if !PLUGINS
navit_SOURCES += builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-09-05 07:22:52
|
Revision: 1371
http://navit.svn.sourceforge.net/navit/?rev=1371&view=rev
Author: martin-s
Date: 2008-09-05 07:23:01 +0000 (Fri, 05 Sep 2008)
Log Message:
-----------
Fix:Core:Added missing file to Makefile.am
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-09-04 20:22:37 UTC (rev 1370)
+++ trunk/navit/navit/Makefile.am 2008-09-05 07:23:01 UTC (rev 1371)
@@ -15,7 +15,7 @@
noinst_LTLIBRARIES = libnavit.la
libnavit_la_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \
- event.c event_glib.c file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
+ event.c event_glib.c event_glib.h file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
mapset.c maptype.c menu.c navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c \
profile.c projection.c route.c search.c speech.c transform.c track.c \
util.c vehicle.c xmlconfig.c attr.h attr_def.h callback.h color.h compass.h coord.h country.h \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-10-10 09:25:45
|
Revision: 1442
http://navit.svn.sourceforge.net/navit/?rev=1442&view=rev
Author: martin-s
Date: 2008-10-10 08:54:20 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Fix:core:Fixed make distcheck
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-09 22:31:21 UTC (rev 1441)
+++ trunk/navit/navit/Makefile.am 2008-10-10 08:54:20 UTC (rev 1442)
@@ -1,5 +1,5 @@
include $(top_srcdir)/Makefile.inc
-DIST_SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm maps
+DIST_SUBDIRS=binding data fib-1.1 gui graphics osd speech support vehicle xpm maps
SUBDIRS=binding data fib-1.1 gui graphics osd speech support vehicle xpm
if BUILD_SAMPLEMAP
SUBDIRS += maps
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-10-14 20:37:19
|
Revision: 1468
http://navit.svn.sourceforge.net/navit/?rev=1468&view=rev
Author: martin-s
Date: 2008-10-14 20:37:13 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Fix:Core:Small bugfix in svn version generation
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-14 20:18:27 UTC (rev 1467)
+++ trunk/navit/navit/Makefile.am 2008-10-14 20:37:13 UTC (rev 1468)
@@ -23,7 +23,7 @@
file.h graphics.h gtkext.h gui.h item.h item_def.h keys.h log.h layer.h layout.h main.h map-share.h map.h\
map_data.h mapset.h maptype.h menu.h navigation.h navit.h osd.h \
param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h search.h speech.h \
- transform.h track.h util.h vehicle.h version.h window.h xmlconfig.h zipfile.h
+ transform.h track.h util.h vehicle.h window.h xmlconfig.h zipfile.h
navit_SOURCES = start.c
navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ -Lfib-1.1 -lfib
@@ -41,7 +41,7 @@
version.h.tmp:
echo "#include \"config.h\"" >version.h.tmp
- echo "#define SVN_VERSION \"$$(LANG=C svnversion)\"" >>version.h.tmp
+ echo "#define SVN_VERSION \"$$(LANG=C svnversion 2>/dev/null)\"" >>version.h.tmp
if ! diff version.h.tmp version.h >/dev/null 2>/dev/null; \
then \
mv version.h.tmp version.h; \
@@ -49,6 +49,9 @@
version.h: version.h.tmp
+distclean-local:
+ rm -f version.h version.h.tmp
+
builtin.c:
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
echo "extern void builtin_init(void);" >>builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-10-15 18:10:14
|
Revision: 1475
http://navit.svn.sourceforge.net/navit/?rev=1475&view=rev
Author: martin-s
Date: 2008-10-15 18:09:08 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Fix:Core:Use corret regular expression
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-15 15:41:04 UTC (rev 1474)
+++ trunk/navit/navit/Makefile.am 2008-10-15 18:09:08 UTC (rev 1475)
@@ -56,5 +56,5 @@
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
echo "extern void builtin_init(void);" >>builtin.c
echo "void builtin_init(void) {" >>builtin.c
- ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init();/" -e "s/.*lib/ module_/" >>builtin.c
+ ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init();/" -e "s/.*\\/lib/ module_/" >>builtin.c
echo "}" >>builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-10-18 20:17:05
|
Revision: 1497
http://navit.svn.sourceforge.net/navit/?rev=1497&view=rev
Author: martin-s
Date: 2008-10-18 20:17:00 +0000 (Sat, 18 Oct 2008)
Log Message:
-----------
Fix:Core:Add internal libintl if needed
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-18 20:16:11 UTC (rev 1496)
+++ trunk/navit/navit/Makefile.am 2008-10-18 20:17:00 UTC (rev 1497)
@@ -26,11 +26,11 @@
transform.h track.h util.h vehicle.h window.h xmlconfig.h zipfile.h
navit_SOURCES = start.c
-navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ -Lfib-1.1 -lfib
+navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib
osm2navit_CPPFLAGS = $(AM_CPPFLAGS) @ZLIB_CFLAGS@ @POSTGRESQL_CFLAGS@
osm2navit_SOURCES = osm2navit.c
-osm2navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@
+osm2navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@ @INTLLIBS@
if EVENT_GLIB
libnavit_la_SOURCES += event_glib.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <za...@us...> - 2008-10-26 22:22:19
|
Revision: 1571
http://navit.svn.sourceforge.net/navit/?rev=1571&view=rev
Author: zaxl
Date: 2008-10-26 21:36:25 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
FIX:core:Make builtin.c depend on config.h
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-26 21:35:09 UTC (rev 1570)
+++ trunk/navit/navit/Makefile.am 2008-10-26 21:36:25 UTC (rev 1571)
@@ -60,7 +60,7 @@
distclean-local:
rm -f version.h version.h.tmp
-builtin.c:
+builtin.c: $(top_builddir)/config.h
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
echo "extern void builtin_init(void);" >>builtin.c
echo "void builtin_init(void) {" >>builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-10-27 14:18:28
|
Revision: 1578
http://navit.svn.sourceforge.net/navit/?rev=1578&view=rev
Author: martin-s
Date: 2008-10-27 14:18:26 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
Fix:Core:remove leftover file with make distclean
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-27 14:16:57 UTC (rev 1577)
+++ trunk/navit/navit/Makefile.am 2008-10-27 14:18:26 UTC (rev 1578)
@@ -58,7 +58,7 @@
version.h: version.h.tmp
distclean-local:
- rm -f version.h version.h.tmp
+ rm -f version.h version.h.tmp builtin.c
builtin.c: $(top_builddir)/config.h
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <za...@us...> - 2008-10-28 22:03:02
|
Revision: 1592
http://navit.svn.sourceforge.net/navit/?rev=1592&view=rev
Author: zaxl
Date: 2008-10-28 22:02:49 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Add:wince: Compile and link resources and common controls to navit.exe
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-10-28 22:01:09 UTC (rev 1591)
+++ trunk/navit/navit/Makefile.am 2008-10-28 22:02:49 UTC (rev 1592)
@@ -45,6 +45,14 @@
navit_LDADD += $(wildcard $(top_builddir)/navit/*/*/*.la)
endif
+if SUPPORT_WIN32
+ navit_LDADD += resource.rsc
+ navit_LDADD += -lcommctrl
+
+resource.rsc: $(top_builddir)/navit/gui/win32/resources/resource.rc
+ $(WINDRES) $(top_builddir)/navit/gui/win32/resources/resource.rc resource.rsc
+endif
+
.PHONY: version.h.tmp
version.h.tmp:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-11-03 23:07:03
|
Revision: 1634
http://navit.svn.sourceforge.net/navit/?rev=1634&view=rev
Author: martin-s
Date: 2008-11-03 23:07:01 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Fix:Core:Clean builtin-support.c with make distclean
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2008-11-03 23:05:50 UTC (rev 1633)
+++ trunk/navit/navit/Makefile.am 2008-11-03 23:07:01 UTC (rev 1634)
@@ -69,7 +69,7 @@
version.h: version.h.tmp
distclean-local:
- rm -f version.h version.h.tmp builtin.c
+ rm -f version.h version.h.tmp builtin.c support-builtin.c
builtin.c: $(top_builddir)/config.h
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-01-06 18:27:12
|
Revision: 1907
http://navit.svn.sourceforge.net/navit/?rev=1907&view=rev
Author: martin-s
Date: 2009-01-06 18:27:10 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Fix:Core:Check for fontconfig and provide own fonts if not present
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-01-06 18:24:56 UTC (rev 1906)
+++ trunk/navit/navit/Makefile.am 2009-01-06 18:27:10 UTC (rev 1907)
@@ -5,6 +5,10 @@
SUBDIRS += maps
endif
+if FONTS
+ SUBDIRS += fonts
+endif
+
AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
BUILT_SOURCES = version.h
if BUILD_SAMPLEMAP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-01-06 19:44:06
|
Revision: 1920
http://navit.svn.sourceforge.net/navit/?rev=1920&view=rev
Author: martin-s
Date: 2009-01-06 19:44:05 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Fix:Core:Make distcheck work again
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-01-06 19:32:37 UTC (rev 1919)
+++ trunk/navit/navit/Makefile.am 2009-01-06 19:44:05 UTC (rev 1920)
@@ -1,5 +1,5 @@
include $(top_srcdir)/Makefile.inc
-DIST_SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm maps
+DIST_SUBDIRS=binding map fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm
if BUILD_SAMPLEMAP
SUBDIRS += maps
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-03-20 20:22:32
|
Revision: 2153
http://navit.svn.sourceforge.net/navit/?rev=2153&view=rev
Author: martin-s
Date: 2009-03-20 20:22:09 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Add:Core:Copy config.h as navit_config.h
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-03-20 20:10:28 UTC (rev 2152)
+++ trunk/navit/navit/Makefile.am 2009-03-20 20:22:09 UTC (rev 2153)
@@ -10,7 +10,7 @@
endif
AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
-BUILT_SOURCES = version.h
+BUILT_SOURCES = version.h navit_config.h
if BUILD_SAMPLEMAP
BUILT_SOURCES += osm2navit$(EXEEXT)
endif
@@ -81,6 +81,14 @@
version.h: version.h.tmp
+navit_config.h: ../config.h
+ cp ../config.h navit_config.h.tmp
+ if ! diff navit_config.h.tmp navit_config.h >/dev/null 2>/dev/null; \
+ then \
+ mv navit_config.h.tmp navit_config.h; \
+ fi
+
+
distclean-local:
rm -f version.h version.h.tmp builtin.c support-builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2009-03-22 00:41:08
|
Revision: 2158
http://navit.svn.sourceforge.net/navit/?rev=2158&view=rev
Author: horwitz
Date: 2009-03-22 00:41:01 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
Fix:Core:remove navit_config.h at distclean to make distcleancheck happy again
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-03-21 17:34:10 UTC (rev 2157)
+++ trunk/navit/navit/Makefile.am 2009-03-22 00:41:01 UTC (rev 2158)
@@ -90,7 +90,7 @@
distclean-local:
- rm -f version.h version.h.tmp builtin.c support-builtin.c
+ rm -f version.h version.h.tmp navit_config.h navit_config.h.tmp builtin.c support-builtin.c
builtin.c: $(top_builddir)/config.h
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-08-16 18:45:28
|
Revision: 2474
http://navit.svn.sourceforge.net/navit/?rev=2474&view=rev
Author: martin-s
Date: 2009-08-16 18:45:22 +0000 (Sun, 16 Aug 2009)
Log Message:
-----------
Fix:Build:Put wordexp in a separate tag to avoid problems with building osm2navit without wordexp
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-08-16 18:40:26 UTC (rev 2473)
+++ trunk/navit/navit/Makefile.am 2009-08-16 18:45:22 UTC (rev 2474)
@@ -18,7 +18,7 @@
if SUPPORT_ANDROID
lib_LTLIBRARIES = libnavit.la
libnavit_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@ -Wl,--no-undefined
- libnavit_la_LIBADD = @NAVIT_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib -llog
+ libnavit_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib -llog
else
bin_PROGRAMS = navit osm2navit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-08-20 09:33:25
|
Revision: 2494
http://navit.svn.sourceforge.net/navit/?rev=2494&view=rev
Author: martin-s
Date: 2009-08-20 09:33:13 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Fix:Build:Allow build in external tree
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-08-20 09:15:43 UTC (rev 2493)
+++ trunk/navit/navit/Makefile.am 2009-08-20 09:33:13 UTC (rev 2494)
@@ -45,6 +45,7 @@
navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,@XSLTS@), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
cp $< navit.xml.tmp
cp $< navit.xml.new
+ if [ "$(builddir)" != "$(srcdir)" ]; then cp $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then saxon -snone navit.xml.tmp $$i >navit.xml.new || exit ; fi ; done
mv navit.xml.new navit.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-08-20 09:54:59
|
Revision: 2495
http://navit.svn.sourceforge.net/navit/?rev=2495&view=rev
Author: martin-s
Date: 2009-08-20 09:54:51 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Fix:Build:navit.dtd is required for saxon
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-08-20 09:33:13 UTC (rev 2494)
+++ trunk/navit/navit/Makefile.am 2009-08-20 09:54:51 UTC (rev 2495)
@@ -27,7 +27,7 @@
pkgdata_DATA = navit.xml
-EXTRA_DIST = navit_shipped.xml
+EXTRA_DIST = navit_shipped.xml navit.dtd
libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c compass.c coord.c country.c cursor.c data_window.c debug.c \
event.c event_glib.h file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-08-21 06:52:44
|
Revision: 2512
http://navit.svn.sourceforge.net/navit/?rev=2512&view=rev
Author: martin-s
Date: 2009-08-21 06:52:38 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Fix:Build:Make made distcheck happy
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-08-20 22:25:26 UTC (rev 2511)
+++ trunk/navit/navit/Makefile.am 2009-08-21 06:52:38 UTC (rev 2512)
@@ -49,6 +49,7 @@
if [ "$(builddir)" != "$(srcdir)" ]; then cp $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; saxon -snone navit.xml.tmp $$i >navit.xml.new || exit ; fi ; done
mv navit.xml.new navit.xml
+ rm -f navit.xml.tmp
if SUPPORT_ANDROID
@@ -131,7 +132,8 @@
distclean-local:
- rm -f version.h version.h.tmp navit_config.h navit_config.h.tmp builtin.c support-builtin.c
+ rm -f version.h version.h.tmp navit_config.h navit_config.h.tmp builtin.c support-builtin.c navit.xml
+ if [ "$(builddir)" != "$(srcdir)" ]; then rm -f navit.dtd; fi
builtin.c: $(top_builddir)/config.h
ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-09-24 07:52:27
|
Revision: 2604
http://navit.svn.sourceforge.net/navit/?rev=2604&view=rev
Author: martin-s
Date: 2009-09-24 07:52:20 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
Fix:Core:Better check for srcdir != builddir
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-09-23 21:35:39 UTC (rev 2603)
+++ trunk/navit/navit/Makefile.am 2009-09-24 07:52:20 UTC (rev 2604)
@@ -45,7 +45,7 @@
XSLTS=@XSLTS@
navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
cp $< navit.xml.new
- if [ "$(builddir)" != "$(srcdir)" ]; then cp $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
+ if [ ! -f "$(builddir)/navit.dtd" ]; then cp -f $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; saxon -snone navit.xml.new $$i >navit.xml.tmp || exit ; mv navit.xml.tmp navit.xml.new || exit ; fi ; done
mv navit.xml.new navit.xml
rm -f navit.xml.tmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-11-23 17:14:47
|
Revision: 2791
http://navit.svn.sourceforge.net/navit/?rev=2791&view=rev
Author: martin-s
Date: 2009-11-23 17:14:38 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Fix:Core:Made android compileable again
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-11-22 19:49:18 UTC (rev 2790)
+++ trunk/navit/navit/Makefile.am 2009-11-23 17:14:38 UTC (rev 2791)
@@ -60,6 +60,7 @@
navit_LDADD =
android/AndroidManifest.xml: android/AndroidManifest.xml.in
+ mkdir -p $(builddir)/android
sed '0,/<uses-sdk/!d' <$< >$@
for i in $(subst $(comma), ,@ANDROID_PERMISSIONS@); do echo " <uses-permission android:name="android.permission.$$i" />" >>$@; done
sed '0,/<uses-sdk/d' <$< >>$@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-11-26 13:03:17
|
Revision: 2801
http://navit.svn.sourceforge.net/navit/?rev=2801&view=rev
Author: martin-s
Date: 2009-11-26 13:03:08 +0000 (Thu, 26 Nov 2009)
Log Message:
-----------
Fix:Build:Typo
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-11-26 12:35:21 UTC (rev 2800)
+++ trunk/navit/navit/Makefile.am 2009-11-26 13:03:08 UTC (rev 2801)
@@ -62,7 +62,7 @@
android/AndroidManifest.xml: android/AndroidManifest.xml.in
mkdir -p $(builddir)/android
sed '0,/<uses-sdk/!d' <$< >$@
- for i in $(subst $(comma), ,@ANDROID_PERMISSIONS@); do echo " <uses-permission android:name="android.permission.$$i" />" >>$@; done
+ for i in $(subst $(comma), ,@ANDROID_PERMISSIONS@); do echo " <uses-permission android:name=\"android.permission.$$i\" />" >>$@; done
sed '0,/<uses-sdk/d' <$< >>$@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-11-28 23:56:24
|
Revision: 2809
http://navit.svn.sourceforge.net/navit/?rev=2809&view=rev
Author: martin-s
Date: 2009-11-28 23:56:17 +0000 (Sat, 28 Nov 2009)
Log Message:
-----------
Fix:Build:Made android compileable again
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-11-27 12:29:37 UTC (rev 2808)
+++ trunk/navit/navit/Makefile.am 2009-11-28 23:56:17 UTC (rev 2809)
@@ -67,7 +67,8 @@
android/build.xml: android/AndroidManifest.xml
- if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android $(builddir)/android; fi
+ mkdir -p android
+ if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android/* $(builddir)/android; fi
android update project -t 3 -p android
apk: all android/build.xml navit.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-12-06 20:52:21
|
Revision: 2851
http://navit.svn.sourceforge.net/navit/?rev=2851&view=rev
Author: martin-s
Date: 2009-12-06 20:52:12 +0000 (Sun, 06 Dec 2009)
Log Message:
-----------
Fix:Build:Correct order of directories when building without plugins
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-12-06 20:10:40 UTC (rev 2850)
+++ trunk/navit/navit/Makefile.am 2009-12-06 20:52:12 UTC (rev 2851)
@@ -1,13 +1,18 @@
include $(top_srcdir)/Makefile.inc
comma=,
SUBDIRS=fib-1.1 support
-SUBDIRS+=.
+if PLUGINS
+ SUBDIRS += .
+endif
DIST_SUBDIRS=binding map maptool fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
SUBDIRS+=binding map font gui graphics osd speech vehicle xpm
if FONTS
SUBDIRS += fonts
endif
+if !PLUGINS
+ SUBDIRS += .
+endif
SUBDIRS+=maptool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-12-14 20:02:21
|
Revision: 2867
http://navit.svn.sourceforge.net/navit/?rev=2867&view=rev
Author: martin-s
Date: 2009-12-14 20:02:12 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
Fix:Core:Remove duplicate definition
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2009-12-11 08:37:06 UTC (rev 2866)
+++ trunk/navit/navit/Makefile.am 2009-12-14 20:02:12 UTC (rev 2867)
@@ -50,7 +50,6 @@
transform.h track.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
navit_nls.h sunriset.c sunriset.h
-comma=,
XSLTS=@XSLTS@
navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
cp $< navit.xml.new
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2010-01-09 23:49:38
|
Revision: 2904
http://navit.svn.sourceforge.net/navit/?rev=2904&view=rev
Author: martin-s
Date: 2010-01-09 23:49:31 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Fix:build:Compile again without plugins on win32
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2010-01-09 23:04:08 UTC (rev 2903)
+++ trunk/navit/navit/Makefile.am 2010-01-09 23:49:31 UTC (rev 2904)
@@ -107,9 +107,9 @@
if SUPPORT_WIN32
navit_LDADD += resource.rsc
if SUPPORT_WIN32CE
- navit_LDADD += -lcommctrl
+ navit_LDADD += -lcommctrl -lwinmm
else
- navit_LDADD += -lgdi32 -lcomctl32
+ navit_LDADD += -lgdi32 -lcomctl32 -lwinmm
endif
resource.rsc: $(top_srcdir)/navit/gui/win32/resources/resource.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X