Attempting to better abstract FreeBSD.

diff --git a/Execute.mk b/Execute.mk
index 86c106ca999d9fa4441a48fc2c24bd6c37f9bf31..130355fd7f57006c1ad683947630c53283691761 100644 (file)
--- a/Execute.mk
+++ b/Execute.mk
@@ -1,4 +1,4 @@
-CY_EXECUTE :=
+CY_EXECUTE := 1

 flags += -DCY_EXECUTE
 code += sig/ffi_type.o sig/parse.o sig/copy.o
 code += Execute.o Bridge.o
 flags += -DCY_EXECUTE
 code += sig/ffi_type.o sig/parse.o sig/copy.o
 code += Execute.o Bridge.o

diff --git a/FreeBSD.mk b/FreeBSD.mk
index 0398df551906f058c8d7222f09358bda5013dfa6..3c39e4625978a0ced7c0acc2bf27a1eb210a25d8 100644 (file)
--- a/FreeBSD.mk
+++ b/FreeBSD.mk
@@ -1,4 +1,2 @@
-export PATH := /usr/local/bin:$(PATH)
-include Execute.mk
-flags += -I/usr/local/include -I/usr/local/include/webkit-1.0
-library += -lwebkit-1.0
+export PATH := /usr/local/bin:/usr/local/GNUstep/System/Tools:$(PATH)
+include PkgConfig.mk

diff --git a/Linux.mk b/Linux.mk
index 80fe9393534fc96753db53383d633ece3db3d4a2..87d0af4bfc77d97f30530dc15fe785982cf9cf6c 100644 (file)
--- a/Linux.mk
+++ b/Linux.mk
@@ -1,13 +1 @@
-export PATH := /usr/local/bin:$(PATH)
-
-ifneq ($(shell pkg-config webkit-1.0 --modversion 2>/dev/null),)
-flags += $(shell pkg-config --cflags webkit-1.0)
-library += -lwebkit-1.0
-include Execute.mk
-else
-ifneq ($(shell pkg-config WebKitGtk --modversion 2>/dev/null),)
-flags += $(shell pkg-config --cflags WebKitGtk)
-library += $(shell pkg-config --libs WebKitGtk)
-include Execute.mk
-endif
-endif
+include PkgConfig.mk

diff --git a/PkgConfig.mk b/PkgConfig.mk
new file mode 100644 (file)
index 0000000..47fb41f
--- /dev/null
+++ b/PkgConfig.mk
@@ -0,0 +1,11 @@
+ifneq ($(shell pkg-config webkit-1.0 --modversion 2>/dev/null),)
+flags += $(shell pkg-config --cflags webkit-1.0)
+library += -lwebkit-1.0
+include Execute.mk
+else
+ifneq ($(shell pkg-config WebKitGtk --modversion 2>/dev/null),)
+flags += $(shell pkg-config --cflags WebKitGtk)
+library += $(shell pkg-config --libs WebKitGtk)
+include Execute.mk
+endif
+endif