Changeset 166793b

Timestamp:

Jun 28, 2017, 10:03:02 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9335ecc

Parents:

a67b60e

Message:

fix tricky build with parser.h

Location:

src

Files:

• Makefile.in (modified) (6 diffs)
• Parser/TypedefTable.h (modified) (1 diff)
• Parser/module.mk (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/Makefile.in

@@ -438 +438 @@
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
+BUILT_SOURCES = Parser/parser.h
 AM_YFLAGS = -d -t -v
 
@@ -448 +449 @@
 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
-all: all-am
+all: $(BUILT_SOURCES)
+        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
@@ -2674 +2676 @@
         done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+        $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
@@ -2680 +2683 @@
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
-install: install-am
+install: $(BUILT_SOURCES)
+        $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -2738 +2742 @@
         -rm -f Parser/parser.cc
         -rm -f Parser/parser.h
+        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
         -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
@@ -2808 +2813 @@
 uninstall-am: uninstall-cfa_cpplibPROGRAMS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:06:19 2017
-// Update Count     : 32
+// Last Modified On : Wed Jun 28 21:56:34 2017
+// Update Count     : 33
 //
 

src/Parser/module.mk

@@ -11 +11 @@
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Jun 28 21:09:38 2017
-## Update Count     : 103
+## Last Modified On : Wed Jun 28 21:58:29 2017
+## Update Count     : 104
 ###############################################################################
+
+BUILT_SOURCES = Parser/parser.h
 
 AM_YFLAGS = -d -t -v

src/main.cc

@@ -11 +11 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:07:30 2017
-// Update Count     : 439
+// Last Modified On : Wed Jun 28 21:56:47 2017
+// Update Count     : 440
 //
 
@@ -26 +26 @@
 
 #include "Parser/parser.hh"
-#include "Parser/parser.h"
 #include "Parser/TypedefTable.h"
 #include "GenPoly/Lvalue.h"