WIP routesearch; before one query per pair

[ypp-sc-tools.web-live.git] / yarrg / Makefile

diff --git a/yarrg/Makefile b/yarrg/Makefile
index 0df5174400910f07356547c6ad4151f473e6c3aa..708bfa275f2b6b60191e19daa3af093ddfb8e608 100644 (file)
--- a/yarrg/Makefile
+++ b/yarrg/Makefile
@@ -31,24 +31,32 @@ 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
 
-ypp-commodities: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
+ROUTESEARCH_OBJS= rsvalue.o rsmain.o
+
+yarrg: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(CONVERT_OBJS): ocr.h convert.h structure.h common.h
 
+routesearch:   $(ROUTESEARCH_OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+$(ROUTESEARCH_OBJS): rscommon.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