Cope with JSON.pm version 2 which has an incompatible change

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

diff --git a/pctb/Makefile b/pctb/Makefile
index 93e5860bdff3338e7e8af63eb31dbb90f35d761d..8223583a4cbc8fe8aff377be57eedbf51c18bfea 100644 (file)
--- a/pctb/Makefile
+++ b/pctb/Makefile
@@ -35,12 +35,21 @@ TARGETS= ypp-commodities
 
 all: $(TARGETS)
 
-CONVERT_OBJS= convert.o ocr.o pages.o structure.o common.o rgbimage.o
+CONVERT_OBJS= convert.o ocr.o pages.o structure.o common.o rgbimage.o resolve.o
 
-ypp-commodities: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11
+ypp-commodities: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(CONVERT_OBJS): ocr.h convert.h structure.h common.h
 
 clean:
-       rm -f $(TARGETS) *.o core core.* *~ t t.* u u.* ./#pages#.ppm 
+       rm -f *.o core core.* *~ vgcore.*
+       rm -f t t.* u u.* v v.* *.tmp *.orig *.rej
+
+realclean: clean
+       rm -f $(TARGETS)
+       rm -f raw.tsv
+       rm -f _pages.ppm _upload-*.html _commodmap.tsv
+       rm -f _master-*.txt _local-*.txt
+       rm -f ./#pages#.ppm ./#upload-*#.html ./#commodmap#.tsv
+       rm -f ./#master-*#.txt ./#local-*#.txt raw.tsv