chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move code and decls between convert.[ch] and common.[ch] so that common.[ch] is for...
[ypp-sc-tools.web-live.git]
/
yarrg
/
Makefile
diff --git
a/yarrg/Makefile
b/yarrg/Makefile
index 708bfa275f2b6b60191e19daa3af093ddfb8e608..695f85cd6ddb2aaaae8a707827d4798234fbe577 100644
(file)
--- a/
yarrg/Makefile
+++ b/
yarrg/Makefile
@@
-36,19
+36,20
@@
TARGETS= yarrg
default: clean-other-directory $(TARGETS)
all: default routesearch
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
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)
$(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)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
$(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.*
clean:
rm -f *.o core core.* *~ vgcore.*