--- Makefile.orig	2016-03-22 21:02:38 UTC
+++ Makefile
@@ -158,14 +158,14 @@ OPENMP_LIBS = -lgomp
 # This requires the presence of the X11 include and library files.
 ifneq ($(OS),Darwin)
 X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
-X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
+X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` $(PTHREAD_LIBS) #`pkg-config --libs xrandr || echo -lXrandr`
 else
 ifeq (,$(wildcard /usr/X11R6))
 X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
-X11_LIBS = -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
+X11_LIBS = $(PTHREAD_LIBS) #`pkg-config --libs xrandr || echo -lXrandr`
 else
 X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
+X11_LIBS = -L/usr/X11R6/lib -lX11 $(PTHREAD_LIBS) #`pkg-config --libs xrandr || echo -lXrandr`
 endif
 endif
 # Flags to enable fast display, using XShm.
@@ -287,7 +287,7 @@ STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(
 STD_GIMP_LIBS += $(PARALLEL_LIBS) $(X11_LIBS)
 else # Windows.
 STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(GDI32_CFLAGS)
-STD_GIMP_LIBS += -mwindows $(PARALLEL_LIBS) $(OPENMP_LIBS) $(GDI32_LIBS) -lpthread -DPSAPI_VERSION=1 -lpsapi
+STD_GIMP_LIBS += -mwindows $(PARALLEL_LIBS) $(OPENMP_LIBS) $(GDI32_LIBS) $(PTHREAD_LIBS) -DPSAPI_VERSION=1 -lpsapi
 endif
 endif
 
@@ -323,7 +323,7 @@ ifeq ($(OS),Unix)
 	@echo "**"
 	@echo "** Start building G'MIC with default Unix configuration."
 	@echo "**"
-	$(MAKE) cli gimp lib zart
+	$(MAKE) cli gimp
 else
 ifeq ($(OS),Darwin)
 	@echo "**"
@@ -339,7 +339,7 @@ endif
 endif
 
 cli:
-	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
 	$(STRIP) gmic$(EXE)
 
 cli_s:
@@ -349,7 +349,7 @@ ifeq ($(OS),Darwin)
 endif
 
 gimp:
-	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
+	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
 
 lib:
 	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS)" libgmic