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=708bfa275f2b6b60191e19daa3af093ddfb8e608;hb=9101afe763ab49064b0ac3b5ab5ea066bcbc6259;hpb=3ca67ce14212ba4421029d7b8db90f03f106c67c

diff --git a/yarrg/Makefile b/yarrg/Makefile
index 708bfa2..a9c833b 100644
--- a/yarrg/Makefile
+++ b/yarrg/Makefile
@@ -36,19 +36,20 @@ TARGETS= yarrg
 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
 
-ROUTESEARCH_OBJS= rsvalue.o rsmain.o
-
-yarrg:	$(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)
+routesearch:	$(ROUTESEARCH_OBJS) $(COMMON_OBJS) -lsqlite3 -lglpk -lm
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-$(ROUTESEARCH_OBJS): rscommon.h
+$(ROUTESEARCH_OBJS): common.h rscommon.h
+$(COMMON_OBJS): common.h
 
 clean:
 	rm -f *.o core core.* *~ vgcore.*