Changeset 4084928e for src/driver/Makefile.am

Timestamp:

Aug 6, 2018, 9:02:25 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f47d0ad

Parents:

364d70c (diff), f271bdd (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' into demangler

File:

• src/driver/Makefile.am (modified) (2 diffs)

src/driver/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Apr 30 17:44:17 2018
-## Update Count     : 11
+## Last Modified On : Thu Aug  2 12:18:25 2018
+## Update Count     : 14
 ###############################################################################
 
@@ -48 +48 @@
 cc1_SOURCES = cc1.cc
 
+aslibdir = ${CFA_LIBDIR}
+aslib_PROGRAMS = as
+as_SOURCES = as.cc
+
 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}