X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2FMakefile;fp=src%2FMakefile;h=81332d485680c0a47c1723b6ac99366d2f69f82d;hb=a5b34ad069a52ff6cf981f01667d102292988811;hp=49e583e70dae1526f3f23e32e1ff7473b90c7857;hpb=20283c6cf5c6951cc1f2787492c67a7fb72aee9a;p=routino

diff --git a/src/Makefile b/src/Makefile
index 49e583e..81332d4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# $Header: /home/amb/routino/src/RCS/Makefile,v 1.36 2010/07/09 17:43:00 amb Exp $
+# $Header: /home/amb/routino/src/RCS/Makefile,v 1.42 2010/09/17 17:42:20 amb Exp $
 #
 # Source code Makefile
 #
@@ -20,21 +20,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Programs
+# Web file paths
+
+WEBDIR=../web/bin
+
+# Compilation programs
 
 CC=gcc
 LD=gcc
 
 LEX=flex
 
-# Program options
+# Compilation program options
 
 CFLAGS=-Wall -Wmissing-prototypes
 #CFLAGS+= -Wextra -pedantic -std=c99
 LDFLAGS=-lm -lc
 
 CFLAGS+= -O3
-#CFLAGS+= -O0 -g
+CFLAGS+= -O0 -g
 #CFLAGS+= -pg
 #CFLAGS+= --coverage
 
@@ -53,9 +57,7 @@ FLAGS64=-D_FILE_OFFSET_BITS=64
 C=$(wildcard *.c)
 D=$(foreach f,$(C),$(addprefix .deps/,$(addsuffix .d,$(basename $f))))
 
-EXE=planetsplitter router filedumper tagmodifier
-
-WEBDIR=../web/bin
+EXE=planetsplitter planetsplitter-slim router router-slim filedumper filedumper-slim tagmodifier
 
 ########
 
@@ -72,7 +74,7 @@ all : $(EXE)
 ########
 
 PLANETSPLITTER_OBJ=planetsplitter.o \
-	           nodesx.o segmentsx.o waysx.o superx.o \
+	           nodesx.o segmentsx.o waysx.o relationsx.o superx.o \
 	           ways.o types.o \
 	           files.o \
 	           results.o queue.o sorting.o \
@@ -83,26 +85,60 @@ planetsplitter : $(PLANETSPLITTER_OBJ)
 
 ########
 
+PLANETSPLITTER_SLIM_OBJ=planetsplitter-slim.o \
+	                nodesx-slim.o segmentsx-slim.o waysx-slim.o relationsx-slim.o superx-slim.o \
+	                ways.o types.o \
+	                files.o \
+	                results.o queue.o sorting.o \
+	                xmlparse.o tagging.o osmparser.o
+
+planetsplitter-slim : $(PLANETSPLITTER_SLIM_OBJ)
+	$(LD) $(PLANETSPLITTER_SLIM_OBJ) -o $@ $(LDFLAGS)
+
+########
+
 ROUTER_OBJ=router.o \
-	   nodes.o segments.o ways.o types.o \
+	   nodes.o segments.o ways.o types.o fakes.o \
+	   optimiser.o output.o \
 	   files.o profiles.o xmlparse.o \
-	   optimiser.o output.o results.o queue.o translations.o
+	   results.o queue.o translations.o
 
 router : $(ROUTER_OBJ)
 	$(LD) $(ROUTER_OBJ) -o $@ $(LDFLAGS)
 
 ########
 
+ROUTER_SLIM_OBJ=router-slim.o \
+	        nodes-slim.o segments-slim.o ways-slim.o types.o fakes.o \
+	        optimiser-slim.o output-slim.o \
+	        files.o profiles.o xmlparse.o \
+	        results.o queue.o translations.o
+
+router-slim : $(ROUTER_SLIM_OBJ)
+	$(LD) $(ROUTER_SLIM_OBJ) -o $@ $(LDFLAGS)
+
+########
+
 FILEDUMPER_OBJ=filedumper.o \
 	       nodes.o segments.o ways.o types.o \
-	       files.o xmlparse.o \
-               visualiser.o
+               visualiser.o \
+	       files.o xmlparse.o
 
 filedumper : $(FILEDUMPER_OBJ)
 	$(LD) $(FILEDUMPER_OBJ) -o $@ $(LDFLAGS)
 
 ########
 
+FILEDUMPER_SLIM_OBJ=filedumper-slim.o \
+	       nodes-slim.o segments-slim.o ways-slim.o types.o \
+               visualiser-slim.o \
+	       files.o xmlparse.o
+
+filedumper-slim : $(FILEDUMPER_SLIM_OBJ)
+	$(LD) $(FILEDUMPER_SLIM_OBJ) -o $@ $(LDFLAGS)
+
+########
+
 TAGMODIFIER_OBJ=tagmodifier.o \
 	        files.o \
                 xmlparse.o tagging.o
@@ -120,7 +156,20 @@ xmlparse.c : xmlparse.l
 ########
 
 %.o : %.c
-	$(CC) -c $(CFLAGS) $(FLAGS64) $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $<)))
+	$(CC) -c $(CFLAGS) $(FLAGS64) -DSLIM=0 -DDATADIR=\"$(datadir)\" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $<)))
+
+%-slim.o : %.c
+	$(CC) -c $(CFLAGS) $(FLAGS64) -DSLIM=1 -DDATADIR=\"$(datadir)\" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $<)))
+
+########
+
+install: all
+	-[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
+	@[ -d $(DESTDIR)$(bindir) ] && \
+	  for file in $(EXE); do \
+	     echo cp $$file $(DESTDIR)$(bindir) ;\
+	     cp -f $$file $(DESTDIR)$(bindir) ;\
+	  done
 
 ########
 
@@ -152,3 +201,8 @@ include $(D)
 ########
 
 .FORCE :
+
+########
+
+top=-top
+include ../Makefile