Compile fixes for amd64 according to Ian

[ypp-sc-tools.main.git] / pctb / Makefile

diff --git a/pctb/Makefile b/pctb/Makefile
index 55f4d53bcb7002d7c6245aef61fb5cba2ef4059e..9daeddb796d0ed2354ade4b21ef42d89ed1015f8 100644 (file)
--- a/pctb/Makefile
+++ b/pctb/Makefile
@@ -1,11 +1,50 @@
-CFLAGS += -Wall -Wwrite-strings -Wpointer-arith -Wmissing-prototypes \
-       -Wstrict-prototypes -Werror -g
 
-all: convert x-manip-window
+# This is part of ypp-sc-tools, a set of third-party tools for assisting
+# players of Yohoho Puzzle Pirates.
+#
+# Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+# are used without permission.  This program is not endorsed or
+# sponsored by Three Rings.
 
-CONVERT_OBJS= convert.o ocr.o pages.o
 
-convert: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11
-$(CONVERT_OBJS): ocr.h
+CC= gcc
+OPTIMISE= -O2
+WERROR= -Werror
+WARNINGS= -Wall -Wwrite-strings -Wpointer-arith -Wmissing-prototypes \
+         -Wstrict-prototypes -Wno-format-zero-length
+DEBUG=-g
 
-x-manip-window: -lXtst -lX11
+CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG)
+
+TARGETS= ypp-commodities
+
+all: $(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
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+$(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.*
+
+realclean: clean
+       rm -f $(TARGETS) ./#pages#.ppm