]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Makefile: move tcmalloc checks outside of FUSE checks. Whoops.
authorGreg Farnum <gregf@hq.newdream.net>
Tue, 21 Sep 2010 22:04:38 +0000 (15:04 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Tue, 21 Sep 2010 22:04:38 +0000 (15:04 -0700)
src/Makefile.am

index 054bab85617eeb949ad60b1cb4bfda517e238e28..553e18f191c4796af55541db021a01ff6908cf73 100644 (file)
@@ -61,6 +61,15 @@ cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm
 cfuse_CXXFLAGS = ${AM_CFLAGS}
 bin_PROGRAMS += cfuse
 
+#if WITH_DEBUG
+#fakefuse_SOURCES = fakefuse.cc msg/FakeMessenger.cc client/fuse.cc client/fuse_ll.cc
+#fakefuse_LDADD = -lfuse libmon.a libmds.a libosd.a libos.a \
+#      libclient.a libosdc.a libcrush.a 
+#bin_PROGRAMS += fakefuse
+#endif
+
+endif
+
 # tcmalloc?
 if WITH_TCMALLOC
 tcmalloc_safety_flags = "-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"
@@ -68,19 +77,12 @@ cosd_LDADD += -ltcmalloc
 cosd_CXXFLAGS += ${tcmalloc_safety_flags}
 cmds_LDADD += -ltcmalloc
 cmds_CXXFLAGS += ${tcmalloc_safety_flags}
+if WITH_FUSE
 cfuse_LDADD += -ltcmalloc
 cfuse_CXXFLAGS += ${tcmalloc_safety_flags}
+endif #WITH_FUSE
 endif # WITH_TCMALLOC
 
-#if WITH_DEBUG
-#fakefuse_SOURCES = fakefuse.cc msg/FakeMessenger.cc client/fuse.cc client/fuse_ll.cc
-#fakefuse_LDADD = -lfuse libmon.a libmds.a libosd.a libos.a \
-#      libclient.a libosdc.a libcrush.a 
-#bin_PROGRAMS += fakefuse
-#endif
-
-endif
-
 # debug targets?
 if WITH_DEBUG