Further minor validation fixups

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

diff --git a/yarrg/Makefile b/yarrg/Makefile
index baf876015d8740ee65f506855f06d279a397bfe4..446ef98b52b761aabea640512120c807c4e489fb 100644 (file)
--- a/yarrg/Makefile
+++ b/yarrg/Makefile
@@ -31,13 +31,13 @@ DEBUG=-g
 
 CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG)
 
-TARGETS= ypp-commodities
+TARGETS= yarrg
 
-all: $(TARGETS)
+all: clean-other-directory $(TARGETS)
 
 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
+yarrg: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(CONVERT_OBJS): ocr.h convert.h structure.h common.h
@@ -45,11 +45,20 @@ $(CONVERT_OBJS): ocr.h convert.h structure.h common.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
        rm -f ./#master-*#.txt ./#local-*#.txt raw.tsv
+
+clean-other-directory:
+       @set -e; if test -d ../pctb && ! test -L ../pctb; then \
+               echo '*** tidying up ../pctb; moving local data here ***'; \
+               set -x; \
+               find ../pctb -path '../pctb/_local-*.txt' -exec mv '{}' . \;; \
+               $(MAKE) -C ../pctb -f ../yarrg/Makefile realclean; \
+               rmdir ../pctb; \
+       fi