From: Nishi <nishi@nishi.boats>
Date: Wed, 21 Aug 2024 17:10:49 +0000 (+0000)
Subject: maybe graphicsmagick
X-Git-Url: https://git.chaotic.ninja/gitweb/nishi/?a=commitdiff_plain;h=de1f7ea93ae8f4a7b4683db3cc10ca882fad24a4;p=repoview.git

maybe graphicsmagick

git-svn-id: file:///raid/svn-personal/repoview/trunk@24 7e8b2a19-8934-dd40-8cb3-db22cdd5a80f
---

diff --git a/CGI/Makefile b/CGI/Makefile
index 2792f65..47eba8b 100644
--- a/CGI/Makefile
+++ b/CGI/Makefile
@@ -13,7 +13,7 @@ repoview.cgi: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTLIBS)
 
 .c.o:
-	$(CC) -I $(PWD)/CGI $(CFLAGS) -c -o $@ $<
+	$(CC) $(EXTCFLAGS) -I $(PWD)/CGI $(CFLAGS) -c -o $@ $<
 
 clean:
 	rm -f *.cgi *.o */*.o
diff --git a/Makefile b/Makefile
index 1078ee9..faeeb3b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 PWD = `pwd`
 PLATFORM = generic
 
-FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) EXTOBJS="`./objs`" EXTLIBS="`./libs`"
+FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) EXTOBJS="`./objs`" EXTLIBS="`./libs`" EXTCFLAGS=""
 
 .PHONY: all clean format ./CGI
 
@@ -24,7 +24,7 @@ check:: check.c config.h
 
 clean:
 	$(MAKE) -C ./CGI clean $(FLAGS)
-	rm -f objs libs check
+	rm -f objs libs check cflags
 
 format:
 	clang-format --verbose -i `find . -name "*.c" -or -name "*.h"`
diff --git a/Platform/freebsd.mk b/Platform/freebsd.mk
index 834e08e..8f4c2dd 100644
--- a/Platform/freebsd.mk
+++ b/Platform/freebsd.mk
@@ -1,6 +1,6 @@
 # $Id$
 
 CC = cc
-CFLAGS = -std=c99 -I /usr/local/include
+CFLAGS = -std=c99 -I /usr/local/include -I /usr/local/include/GraphicsMagick
 LDFLAGS = -L /usr/local/lib
 LIBS = -lcrypto
diff --git a/Platform/netbsd.mk b/Platform/netbsd.mk
index 883ca16..5c20647 100644
--- a/Platform/netbsd.mk
+++ b/Platform/netbsd.mk
@@ -1,6 +1,6 @@
 # $Id$
 
 CC = cc
-CFLAGS = -std=c99 -I /usr/pkg/include
+CFLAGS = -std=c99 -I /usr/pkg/include -I /usr/pkg/include/GraphicsMagick
 LDFLAGS = -L /usr/pkg/lib -Wl,-R/usr/pkg/lib
 LIBS = -lcrypto
diff --git a/config.h.tmpl b/config.h.tmpl
index ecb869a..df1bca7 100644
--- a/config.h.tmpl
+++ b/config.h.tmpl
@@ -48,9 +48,8 @@
 /* Authentication type. */
 #define USE_COOKIE
 
-/* GraphicsMagick or ImageMagick. */
-#define USE_IMAGEMAGICK
-#undef USE_GRAPHICSMAGICK
+/* Use GraphicsMagick or not. */
+#define USE_GRAPHICSMAGICK
 
 /* PATH, uses PATH from environment automatically if not defined. */
 #undef USE_PATH
diff --git a/libs.c b/libs.c
index 75e1423..0cbd98e 100644
--- a/libs.c
+++ b/libs.c
@@ -13,12 +13,6 @@ int main() {
 	printf(" ");
 #if defined(USE_GRAPHICSMAGICK)
 	printf("-lGraphicsMagickWand");
-#elif defined(USE_IMAGEMAGICK)
-#ifdef __NetBSD__
-	printf("-lMagickWand-7.Q16HDRI");
-#else
-	printf("-lMagickWand-7");
-#endif
 #endif
 	printf("\n");
 	return 0;