X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FMakefile;h=a9c833b622760f697f86d30fe52c5b1bef6d547e;hp=0df5174400910f07356547c6ad4151f473e6c3aa;hb=9101afe763ab49064b0ac3b5ab5ea066bcbc6259;hpb=03d4218e5ced913f70a1fd9308edbd8f9615703c

diff --git a/yarrg/Makefile b/yarrg/Makefile
index 0df5174..a9c833b 100644
--- a/yarrg/Makefile
+++ b/yarrg/Makefile
@@ -31,24 +31,33 @@ DEBUG=-g
 
 CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG)
 
-TARGETS= ypp-commodities
+TARGETS= yarrg
 
-all: clean-other-directory $(TARGETS)
+default: clean-other-directory $(TARGETS)
+all: default routesearch
 
-CONVERT_OBJS= convert.o ocr.o pages.o structure.o common.o rgbimage.o resolve.o
+CONVERT_OBJS= convert.o ocr.o pages.o structure.o rgbimage.o resolve.o
+COMMON_OBJS= common.o
+ROUTESEARCH_OBJS= rsvalue.o rsmain.o rssql.o rssearch.o
 
-ypp-commodities: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
+yarrg:	$(CONVERT_OBJS) $(COMMON_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-$(CONVERT_OBJS): ocr.h convert.h structure.h common.h
+$(CONVERT_OBJS): common.h ocr.h convert.h structure.h
+
+routesearch:	$(ROUTESEARCH_OBJS) $(COMMON_OBJS) -lsqlite3 -lglpk -lm
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+$(ROUTESEARCH_OBJS): common.h rscommon.h
+$(COMMON_OBJS): common.h
 
 clean:
 	rm -f *.o core core.* *~ vgcore.*
 	rm -f t t.* u u.* v v.* *.tmp *.orig *.rej
+	rm -f ypp-commodities
 
 realclean: clean
 	rm -f $(TARGETS)
-	rm -f raw.tsv
 	rm -f _pages.ppm _pages.ppm.gz _upload-*.html _commodmap.tsv
 	rm -f _master-*.txt _master-*.txt.gz _local-*.txt
 	rm -f ./#pages#.ppm ./#upload-*#.html ./#commodmap#.tsv