chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routesearch: correct elim algorithms
[ypp-sc-tools.db-live.git]
/
yarrg
/
Makefile
diff --git
a/yarrg/Makefile
b/yarrg/Makefile
index 446ef98b52b761aabea640512120c807c4e489fb..a9c833b622760f697f86d30fe52c5b1bef6d547e 100644
(file)
--- a/
yarrg/Makefile
+++ b/
yarrg/Makefile
@@
-33,14
+33,23
@@
CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG)
TARGETS= yarrg
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
-yarrg: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
+yarrg: $(CONVERT_OBJS)
$(COMMON_OBJS)
-lnetpbm -lXtst -lX11 -lpcre -lm
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
$(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.*
clean:
rm -f *.o core core.* *~ vgcore.*