Merge branch 'llvm-3.5' into llvm-3.7

Fix opcode2name.cpp build.
lanl · Sep 23, 2015 · ac099e1 · ac099e1
2 parents d70487b + 5771100
commit ac099e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ syntax: glob
 *~
 Makefile.in
 aclocal.m4
-build
 compile
 config.guess
 config.h.in
@@ -17,6 +16,4 @@ depcomp
 install-sh
 ltmain.sh
 missing
-opcode2name.cpp
-opcode2name.h
 test-driver
diff --git a/lib/byfl/Makefile.am b/lib/byfl/Makefile.am
@@ -16,7 +16,6 @@ libbyfl_la_SOURCES = \
 	callstack.cpp \
 	callstack.h \
 	datastructs.cpp \
-	opcode2name.cpp \
 	pagetable.cpp \
 	pagetable.h \
 	reuse-dist.cpp \
@@ -26,13 +25,14 @@ libbyfl_la_SOURCES = \
 	threading.cpp \
 	ubytes.cpp \
 	vectors.cpp
+nodist_libbyfl_la_SOURCES = opcode2name.cpp
+BUILT_SOURCES = opcode2name.cpp
 
 libbyfl_la_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir)/../include
 libbyfl_la_LDFLAGS = -version-info 0:0:0
 
-BUILT_SOURCES = opcode2name.cpp
 CLEANFILES = $(BUILT_SOURCES)
 
 # Specify how to create opcode2name.cpp.
 opcode2name.cpp: $(top_srcdir)/gen_opcode2name
-	$(AM_V_GEN) $(PERL) $(top_srcdir)/gen_opcode2name '$(CPP) $(CPPFLAGS)' CPP > $(srcdir)/opcode2name.cpp
+	$(AM_V_GEN) $(PERL) $(top_srcdir)/gen_opcode2name '$(CPP) $(CPPFLAGS)' CPP > opcode2name.cpp