WIP route value calculation - compiles, although doesn't run the LP

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

diff --git a/yarrg/Makefile b/yarrg/Makefile
index 708bfa275f2b6b60191e19daa3af093ddfb8e608..ca05ff5a91968bb453a9494943a729aa27b453ac 100644 (file)
--- 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 rssetup.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.*