Changeset 2fbc904


Ignore:
Timestamp:
Aug 31, 2020, 3:18:09 PM (14 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
942453a
Parents:
eb67b47
Message:

Makefiles now pass 'distcheck' until test folder.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    reb67b47 r2fbc904  
    2727        @ls $(config_file) || (echo "Missing config.data, re-run configure script again" && false)
    2828        @$(eval config_data = $(shell cat $(config_file)))
    29         @echo "Configuring libcfa with '$(config_data)''"
     29        @echo "Configuring libcfa ($(abs_top_srcdir)/libcfa/configure) with '$(config_data)' from $(shell pwd) / $(dir $@)"
    3030        @cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data)
    3131
     
    3434man1_MANS = doc/man/cfa.1
    3535
    36 EXTRA_DIST = LICENSE doc/man/cfa.1 libcfa/configure automake libcfa/Makefile.dist.am libcfa/Makefile.dist.in
     36EXTRA_DIST = LICENSE doc/man/cfa.1 libcfa/configure libcfa/Makefile.dist.am libcfa/Makefile.dist.in
    3737
    3838debug=yes
  • configure.ac

    reb67b47 r2fbc904  
    137137                \'--enable-gprofiler=*) ;;
    138138                \'--disable-gprofiler) ;;
     139
     140                # skip this, it only causes problems
     141                \'--srcdir=*) ;;
    139142
    140143                # append all other arguments to the sub configure arguments
  • libcfa/Makefile.am

    reb67b47 r2fbc904  
    1616
    1717AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names
    18 ACLOCAL_AMFLAGS  = -I ../automake
     18ACLOCAL_AMFLAGS  = -I automake
    1919SUBDIRS = prelude src      # order important
  • libcfa/configure.ac

    reb67b47 r2fbc904  
    44AC_PREREQ([2.68])
    55AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
    6 AC_CONFIG_AUX_DIR([../automake])
    7 AC_CONFIG_MACRO_DIRS([../automake])
     6AC_CONFIG_AUX_DIR([automake])
     7AC_CONFIG_MACRO_DIRS([automake])
    88AM_SILENT_RULES([yes])
    99
  • libcfa/prelude/Makefile.am

    reb67b47 r2fbc904  
    1717# create object files in directory with source files
    1818AUTOMAKE_OPTIONS = foreign subdir-objects
    19 ACLOCAL_AMFLAGS  = -I ../automake
     19ACLOCAL_AMFLAGS  = -I automake
    2020
    2121# put into lib for now
  • libcfa/src/Makefile.am

    reb67b47 r2fbc904  
    1717# create object files in directory with source files
    1818AUTOMAKE_OPTIONS = foreign subdir-objects
    19 ACLOCAL_AMFLAGS  = -I ../automake
     19ACLOCAL_AMFLAGS  = -I automake
    2020
    2121include $(top_srcdir)/../tools/build/cfa.make
     
    3232# use -no-include-stdhdr to prevent rebuild cycles
    3333# The built sources must not depend on the installed inst_headers_src
    34 AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
     34AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr -I$(srcdir)/concurrency $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
    3535AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3636AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
Note: See TracChangeset for help on using the changeset viewer.