X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=Makefile;h=a1270276bbda0f1dae4ae5c8a1c2ee77f46a2bff;hb=45032dd83a49ffd76aa5db4c2ef65a832c413c1c;hp=434ad704d252c057725aa098baab4c9747bcf855;hpb=b77595688b752c40cc50a33471aa0e4de08da0c6;p=fio.git

diff --git a/Makefile b/Makefile
index 434ad704..a1270276 100644
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,15 @@ SCRIPTS = fio_generate_plots
 UNAME  := $(shell uname)
 
 GTKCFLAGS = `pkg-config gtk+-2.0 --cflags`
-GTKLDFLAGS = `pkg-config gtk+-2.0 --libs`
+GTKLDFLAGS = `pkg-config gtk+-2.0 gthread-2.0 --libs`
 
-SOURCE := gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
+SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
 		eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \
 		rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
 		lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \
 		engines/mmap.c engines/sync.c engines/null.c engines/net.c \
 		memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
-		endian_check.c
+		endian_check.c fio_initialization.c
 
 ifeq ($(UNAME), Linux)
   SOURCE += diskutil.c fifo.c blktrace.c helpers.c cgroup.c trim.c \
@@ -67,7 +67,12 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
   CC	  = x86_64-w64-mingw32-gcc
 endif
 
+FIO_SOURCE = $(SOURCE) fio.c
+GFIO_SOURCE = $(SOURCE) gfio.c
+
 OBJS = $(SOURCE:.c=.o)
+FIO_OBJS = $(OBJS) fio.o
+GFIO_OBJS = $(OBJS) gfio.o
 
 T_SMALLOC_OBJS = t/stest.o
 T_SMALLOC_OBJS += mutex.o smalloc.o t/log.o
@@ -108,8 +113,8 @@ t/stest: $(T_SMALLOC_OBJS)
 t/ieee754: $(T_IEEE_OBJS)
 	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS) $(LDFLAGS)
 
-fio: $(OBJS)
-	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
+fio: $(FIO_OBJS)
+	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(LIBS) $(LDFLAGS)
 
 .depend: $(SOURCE)
 	$(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
@@ -133,7 +138,8 @@ ifneq ($(wildcard .depend),)
 include .depend
 endif
 
-gfio:	gfio.c
-	$(CC) ${CFLAGS} ${GTKCFLAGS} ${GTKLDFLAGS} -pthread -o gfio gfio.c
+gfio:	$(OBJS)	gfio.c
+	$(CC) ${CPPFLAGS} ${CFLAGS} ${GTKCFLAGS} ${LDFLAGS} ${GTKLDFLAGS} -pthread -o gfio $(OBJS) gfio.c $(LIBS) ${LDFLAGS}
+