diff --git a/regress/Makefile b/regress/Makefile
index 14d5c383..09214579 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,5 +1,5 @@
 CFLAGS += -I../include
-LDFLAGS = -L.. -lunicorn
+LDFLAGS += ../libunicorn.a $(shell pkg-config --libs glib-2.0) -lpthread -lm
 
 TESTS = map_crash map_write
 TESTS += sigill sigill2
@@ -16,4 +16,7 @@ all: $(TESTS)
 clean:
 	rm -f $(TESTS)
 
+%: %.c
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
 .PHONY: all clean
diff --git a/regress/block_test.c b/regress/block_test.c
index 7aaf1b93..4cc2a826 100644
--- a/regress/block_test.c
+++ b/regress/block_test.c
@@ -1,5 +1,6 @@
 #include <sys/types.h>
 #include <stdint.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -13,7 +14,7 @@ static int count = 1;
 // @size: size of machine instruction being executed
 // @user_data: user data passed to tracing APIs.
 void cb_hookblock(ucengine *uc, uint64_t address, uint32_t size, void *user_data) {
-   fprintf(stderr, "# >>> Tracing basic block at 0x%llx, block size = 0x%x\n", address, size);
+   fprintf(stderr, "# >>> Tracing basic block at 0x%"PRIx64", block size = 0x%x\n", address, size);
    if (address != 0x1000000 && address != 0x1000200) {
       fprintf(stderr, "not ok %d - address != 0x1000000 && address != 0x1000200\n", count++);
       _exit(1);
diff --git a/samples/Makefile b/samples/Makefile
index 1ebb891f..aad79ad2 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -7,7 +7,7 @@ LIBNAME = unicorn
 
 # Find GLIB
 ifndef GLIB
-GLIB = `pkg-config --libs glib-2.0`
+GLIB = $(shell pkg-config --libs glib-2.0)
 endif
 
 UNICORN_DEP_LIBS_STATIC += -lpthread -lm $(GLIB)