Skip to content

Commit 908ef7c

Browse files
Merge pull request #5 from csmith-project/master
Updating make file from csmith-master
2 parents 2d2b4d6 + c7e6a90 commit 908ef7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1839
-5804
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ language: cpp
3838
script: >
3939
CXX=clang++
4040
CC=clang
41-
./configure &&
41+
cmake . &&
4242
make -j2 &&
43-
make check
43+
python gen100.py
4444
4545
###############################################################################
4646

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-*- mode: Text -*-
22

3-
Csmith is Copyright (c) 2007-2017 The University of Utah.
3+
Csmith is Copyright (c) 2007-2018 The University of Utah.
44

55
Csmith is distributed under the following license, which is often called
66
the "BSD License."

Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## -*- mode: Makefile-Automake -*-
22
##
3-
## Copyright (c) 2008, 2010, 2011, 2012, 2017 The University of Utah
3+
## Copyright (c) 2008, 2010, 2011, 2012, 2017, 2018 The University of Utah
44
## All rights reserved.
55
##
66
## This file is part of `csmith', a random generator of C programs.
@@ -29,6 +29,8 @@
2929

3030
###############################################################################
3131

32+
ACLOCAL_AMFLAGS = -I m4
33+
3234
SUBDIRS = \
3335
doc \
3436
runtime \

Makefile.in

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -139,7 +139,7 @@ am__recursive_targets = \
139139
$(RECURSIVE_CLEAN_TARGETS) \
140140
$(am__extra_recursive_targets)
141141
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
142-
cscope distdir dist dist-all distcheck
142+
cscope distdir distdir-am dist dist-all distcheck
143143
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
144144
$(LISP)config.h.in
145145
# Read a list of newline-separated strings from the standard input,
@@ -336,6 +336,7 @@ target_alias = @target_alias@
336336
top_build_prefix = @top_build_prefix@
337337
top_builddir = @top_builddir@
338338
top_srcdir = @top_srcdir@
339+
ACLOCAL_AMFLAGS = -I m4
339340
SUBDIRS = \
340341
doc \
341342
runtime \
@@ -373,8 +374,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
373374
echo ' $(SHELL) ./config.status'; \
374375
$(SHELL) ./config.status;; \
375376
*) \
376-
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
377-
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
377+
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
378+
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
378379
esac;
379380

380381
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -516,7 +517,10 @@ distclean-tags:
516517
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
517518
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
518519

519-
distdir: $(DISTFILES)
520+
distdir: $(BUILT_SOURCES)
521+
$(MAKE) $(AM_MAKEFLAGS) distdir-am
522+
523+
distdir-am: $(DISTFILES)
520524
$(am__remove_distdir)
521525
test -d "$(distdir)" || mkdir "$(distdir)"
522526
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

0 commit comments

Comments
 (0)