$NetBSD: patch-ab,v 1.1.1.1 2003/09/10 21:44:46 itojun Exp $

--- image/Makefile	2002-08-08 20:13:01.000000000 +0900
+++ image/Makefile	2003-09-11 06:36:38.000000000 +0900
@@ -35,38 +35,38 @@
 # pour les images
 
 $(OBJ_DIR)/image.o : $(IMAGE_DIR)/image.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC_OPT) -c $(IMAGE_DIR)/image.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_draw_func.o : $(IMAGE_DIR)/image.h $(IMAGE_DIR)/image_draw_func.c\
  $(IMAGE_DIR)/image_draw_func.h $(UTILS_H)
-	$(CC_OPT) -c $(IMAGE_DIR)/image_draw_func.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_draw_func.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_trans.o : $(IMAGE_DIR)/image_trans.c $(IMAGE_DIR)/image.h\
  $(IMAGE_DIR)/image_draw_func.h $(IMAGE_DIR)/color.h $(UTILS_H)
-	$(CC_OPT) -c $(IMAGE_DIR)/image_trans.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_trans.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_filter.o : $(IMAGE_DIR)/image_filter.c $(IMAGE_DIR)/image.h\
  $(IMAGE_DIR)/image_draw_func.h $(IMAGE_DIR)/color.h $(UTILS_H)
-	$(CC_OPT) -c $(IMAGE_DIR)/image_filter.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_filter.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_bmp.o : $(IMAGE_DIR)/image_from_bmp.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_bmp.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_bmp.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_gif.o : $(IMAGE_DIR)/image_from_gif.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_gif.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_gif.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_tga.o : $(IMAGE_DIR)/image_from_tga.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_tga.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_tga.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_jpeg.o : $(IMAGE_DIR)/image_from_jpeg.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_jpeg.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_jpeg.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_pgm.o : $(IMAGE_DIR)/image_from_pgm.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_pgm.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_pgm.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_ppm.o : $(IMAGE_DIR)/image_from_ppm.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_ppm.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_ppm.c -o $@ $(INCLUDE_PATH)
 
 $(OBJ_DIR)/image_from_pbm.o : $(IMAGE_DIR)/image_from_pbm.c $(IMAGE_DIR)/image.h $(UTILS_H)
-	$(CC) -c $(IMAGE_DIR)/image_from_pbm.c -o $@ $(INCLUDE_PATH)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(IMAGE_DIR)/image_from_pbm.c -o $@ $(INCLUDE_PATH)