Changeset 91788fa for src/driver

Timestamp:

Jul 25, 2018, 6:23:58 PM (7 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

a95c117, f0b3f51

Parents:

40a7d9c (diff), e89f4b1 (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.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/driver

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)

src/driver/Makefile.am

@@ -28 +28 @@
 endif
 
+# don't install cfa directly
 noinst_PROGRAMS = cfa
-cfa_SOURCES = cfa.cc
 
+# use
 install-exec-hook:
         @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
@@ -40 +41 @@
         cd "$(CFA_BINDIR)" && rm -f $(CFA_NAME)
 
+cfa_SOURCES = cfa.cc
+
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}

src/driver/Makefile.in

@@ -626 +626 @@
 
 
+# use
 install-exec-hook:
         @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"