Fix:Core:Further cleanups of build system

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1500 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/Makefile.am b/Makefile.am
index 2a28cb5..3a86bec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 include $(top_srcdir)/Makefile.inc
-SUBDIRS=navit po intl
+SUBDIRS=intl navit po
 pkgdoc_DATA = README
 EXTRA_DIST = README COPYRIGHT

diff --git a/navit/Makefile.am b/navit/Makefile.am
index daef9e6..ac3966d 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -6,7 +6,11 @@ if BUILD_SAMPLEMAP
 endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=navit
-BUILT_SOURCES=osm2navit$(EXEEXT) version.h
+BUILT_SOURCES = version.h
+if BUILD_SAMPLEMAP
+  BUILT_SOURCES += osm2navit$(EXEEXT)
+endif
+
 bin_PROGRAMS = navit osm2navit
 
 pkgdata_DATA = navit.xml