- Timestamp:
- Aug 15, 2018, 1:58:02 PM (7 years ago)
- 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, stuck-waitfor-destruct
- Children:
- 90cac45
- Parents:
- d7d63e5 (diff), 7bd4cc9 (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. - Location:
- tools
- Files:
-
- 4 edited
-
Makefile.am (modified) (1 diff)
-
Makefile.in (modified) (7 diffs)
-
prettyprinter/Makefile.am (modified) (2 diffs)
-
prettyprinter/Makefile.in (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
tools/Makefile.am
rd7d63e5 r5e44ac2 15 15 ############################################################################### 16 16 17 AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names 18 17 19 CC = @BACKEND_CC@ 18 CFLAGS = -Wall -Wextra -O2 -g20 AM_CFLAGS = -Wall -Wextra -O2 -g 19 21 20 22 noinst_PROGRAMS = busy catchsig repeat watchdog -
tools/Makefile.in
rd7d63e5 r5e44ac2 96 96 subdir = tools 97 97 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 98 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 98 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \ 99 $(top_srcdir)/configure.ac 99 100 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 100 101 $(ACLOCAL_M4) … … 187 188 BACKEND_CC = @BACKEND_CC@ 188 189 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@ 189 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@190 190 CC = @BACKEND_CC@ 191 191 CCAS = @CCAS@ … … 202 202 CFA_NAME = @CFA_NAME@ 203 203 CFA_PREFIX = @CFA_PREFIX@ 204 CFLAGS = -Wall -Wextra -O2 -g204 CFLAGS = @CFLAGS@ 205 205 CPP = @CPP@ 206 206 CPPFLAGS = @CPPFLAGS@ … … 218 218 EXEEXT = @EXEEXT@ 219 219 GREP = @GREP@ 220 HOST_FLAGS = @HOST_FLAGS@ 220 221 INSTALL = @INSTALL@ 221 222 INSTALL_DATA = @INSTALL_DATA@ … … 227 228 LEXLIB = @LEXLIB@ 228 229 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ 230 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@ 231 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@ 229 232 LIBOBJS = @LIBOBJS@ 230 233 LIBS = @LIBS@ 231 234 LTLIBOBJS = @LTLIBOBJS@ 232 MACHINE_TYPE = @MACHINE_TYPE@233 235 MAKEINFO = @MAKEINFO@ 234 236 MKDIR_P = @MKDIR_P@ … … 246 248 SHELL = @SHELL@ 247 249 STRIP = @STRIP@ 250 TARGET_HOSTS = @TARGET_HOSTS@ 248 251 VERSION = @VERSION@ 249 252 YACC = @YACC@ … … 301 304 top_builddir = @top_builddir@ 302 305 top_srcdir = @top_srcdir@ 306 AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names 307 AM_CFLAGS = -Wall -Wextra -O2 -g 303 308 busy_SOURCES = busy.c 304 309 busy_LDFLAGS = -pthread -
tools/prettyprinter/Makefile.am
rd7d63e5 r5e44ac2 1 1 ######################## -*- Mode: Makefile-Automake -*- ###################### 2 ## 2 ## 3 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 4 ## 5 5 ## The contents of this file are covered under the licence agreement in the 6 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## Makefile.am -- 9 ## 7 ## 8 ## Makefile.am -- 9 ## 10 10 ## Author : Peter A. Buhr 11 11 ## Created On : Wed Jun 28 12:07:10 2017 … … 14 14 ## Update Count : 20 15 15 ############################################################################### 16 17 AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names 16 18 17 19 BUILT_SOURCES = parser.hh -
tools/prettyprinter/Makefile.in
rd7d63e5 r5e44ac2 95 95 subdir = tools/prettyprinter 96 96 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 97 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 97 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \ 98 $(top_srcdir)/configure.ac 98 99 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 99 100 $(ACLOCAL_M4) … … 211 212 BACKEND_CC = @BACKEND_CC@ 212 213 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@ 213 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@214 214 CC = @CC@ 215 215 CCAS = @CCAS@ … … 242 242 EXEEXT = @EXEEXT@ 243 243 GREP = @GREP@ 244 HOST_FLAGS = @HOST_FLAGS@ 244 245 INSTALL = @INSTALL@ 245 246 INSTALL_DATA = @INSTALL_DATA@ … … 251 252 LEXLIB = @LEXLIB@ 252 253 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ 254 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@ 255 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@ 253 256 LIBOBJS = @LIBOBJS@ 254 257 LIBS = @LIBS@ 255 258 LTLIBOBJS = @LTLIBOBJS@ 256 MACHINE_TYPE = @MACHINE_TYPE@257 259 MAKEINFO = @MAKEINFO@ 258 260 MKDIR_P = @MKDIR_P@ … … 270 272 SHELL = @SHELL@ 271 273 STRIP = @STRIP@ 274 TARGET_HOSTS = @TARGET_HOSTS@ 272 275 VERSION = @VERSION@ 273 276 YACC = @YACC@ … … 325 328 top_builddir = @top_builddir@ 326 329 top_srcdir = @top_srcdir@ 330 AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names 327 331 BUILT_SOURCES = parser.hh 328 332 AM_YFLAGS = -d -t -v
Note:
See TracChangeset
for help on using the changeset viewer.
