Changeset 2d9e75d for Makefile

Timestamp:

07/22/15 14:18:06 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

96927c5

Parents:

09f3093 (diff), 3c9fc94 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Hal Finkel <hfinkel@…> (07/22/15 14:18:06)

git-committer:

Hal Finkel <hfinkel@…> (07/22/15 14:18:06)

Message:

Merge branch 'master' of git.mcs.anl.gov:memlog

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -2 +2 @@
 CXXFLAGS = -std=gnu++0x -O3 -g
 
-CPPFLAGS =
+# When compiling with CXX=powerpc64-bgq-linux-g++, we need these:
+CPPFLAGS = -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
+
 LDFLAGS = -lpthread -ldl
 
@@ -16 +18 @@
         $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o libmemlog.so memlog.cpp
 
-install: all memlog2dot README
-        cp -a libmemlog.so memlog_s.o memlog2dot README $(DESTDIR)/
+install: all memlog_analyze README
+        cp -a libmemlog.so memlog_s.o memlog_analyze README $(DESTDIR)/
+        echo '-Wl,--wrap,malloc,--wrap,valloc,--wrap,realloc,--wrap,calloc,--wrap,memalign,--wrap,free,--wrap,posix_memalign,--wrap,mmap,--wrap,mmap64,--wrap,munmap $(DESTDIR)/memlog_s.o -lpthread -ldl' > $(DESTDIR)/memlog_s_ld_cmds
 
 clean: