Changeset cdbab55 for driver/Makefile.am

Timestamp:

Aug 21, 2018, 2:24:29 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6af (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• driver/Makefile.am (moved) (moved from src/driver/Makefile.am ) (2 diffs)

driver/Makefile.am

@@ -15 +15 @@
 ###############################################################################
 
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
-if BUILD_NO_LIB
-else
-AM_CXXFLAGS += -DHAVE_LIBCFA
-endif
-if BUILD_DEBUG
-AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
-endif
-if BUILD_RELEASE
-AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
-endif
+AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 
 # don't install cfa directly
@@ -45 +37 @@
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}
-cc1lib_PROGRAMS = cc1
+cc1lib_PROGRAMS = as cc1
+as_SOURCES = as.cc
 cc1_SOURCES = cc1.cc
 
-aslibdir = ${CFA_LIBDIR}
-aslib_PROGRAMS = as
-as_SOURCES = as.cc
-
 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}