Fix includes and use pkg-config to find libraries in C examples

Author: linkmauve

examples/c_canvas_glfw_minimal/Makefile

@@ -5,8 +5,8 @@ RUST_TARGET_DIR?=../../target
 RUST_SRC_DIR?=../../c
 RUSTFLAGS?=
 
-CFLAGS?=-Wall -g -I../../c/build/include
-LIBS?=-lpathfinder_c -lglfw
+CFLAGS?=-Wall -g $(shell pkg-config --cflags pathfinder_c glfw3)
+LIBS?=$(shell pkg-config --libs pathfinder_c glfw3)
 MKDIR?=mkdir -p
 RM?=rm
 CARGO?=cargo

examples/c_canvas_glfw_minimal/c_canvas_glfw_minimal.c

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #include <GLFW/glfw3.h>
-#include <pathfinder/pathfinder.h>
+#include <pathfinder_c.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>

examples/c_canvas_minimal/Makefile

@@ -5,8 +5,8 @@ RUST_TARGET_DIR?=../../target
 RUST_SRC_DIR?=../../c
 RUSTFLAGS?=-C target-cpu=native
 
-CFLAGS?=-Wall -g -I../../c/build/include
-LIBS?=-lpathfinder_c
+CFLAGS?=-Wall -g $(shell pkg-config --cflags pathfinder_c sdl2)
+LIBS?=$(shell pkg-config --libs pathfinder_c sdl2)
 MKDIR?=mkdir -p
 RM?=rm
 CARGO?=cargo
@@ -35,10 +35,10 @@ all:	$(TARGET_DIR)/c_canvas_minimal
 .PHONY:	clean rustlib
 
 $(TARGET_DIR)/c_canvas_minimal:	$(OBJ_DIR)/c_canvas_minimal.o rustlib
-	$(MKDIR) $(TARGET_DIR) && $(CC) $(LDFLAGS) $(LIBS) `sdl2-config --libs` -o $@ $<
+	$(MKDIR) $(TARGET_DIR) && $(CC) $(LDFLAGS) $(LIBS) -o $@ $<
 
 $(OBJ_DIR)/%.o:	$(SRC_DIR)/%.c
-	$(MKDIR) $(OBJ_DIR) && $(CC) -c $(CFLAGS) `sdl2-config --cflags` -o $@ $<
+	$(MKDIR) $(OBJ_DIR) && $(CC) -c $(CFLAGS) -o $@ $<
 
 rustlib:
 	cd $(RUST_SRC_DIR) && RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) build $(CARGOFLAGS)

examples/c_canvas_minimal/c_canvas_minimal.c

@@ -10,7 +10,7 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_opengl.h>
-#include <pathfinder/pathfinder.h>
+#include <pathfinder_c.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>