X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2FMakefile;h=a9c833b622760f697f86d30fe52c5b1bef6d547e;hp=baf876015d8740ee65f506855f06d279a397bfe4;hb=64f37d1c80bfd082dab4a11db206515890af6f44;hpb=c68fb80a6bbf7acbcac4b2cb2143f5fea745cd2b

diff --git a/yarrg/Makefile b/yarrg/Makefile
index baf8760..a9c833b 100644
--- a/yarrg/Makefile
+++ b/yarrg/Makefile
@@ -31,25 +31,43 @@ DEBUG=-g
 
 CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG)
 
-TARGETS= ypp-commodities
+TARGETS= yarrg
 
-all: $(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
 	rm -f ./#master-*#.txt ./#local-*#.txt raw.tsv
+
+clean-other-directory:
+	@set -e; if test -d ../pctb && ! test -L ../pctb; then \
+		echo '*** tidying up ../pctb; moving local data here ***'; \
+		set -x; \
+		find ../pctb -path '../pctb/_local-*.txt' -exec mv '{}' . \;; \
+		$(MAKE) -C ../pctb -f ../yarrg/Makefile realclean; \
+		rmdir ../pctb; \
+	fi