Changeset b7fe2e6


Ignore:
Timestamp:
Aug 25, 2020, 4:01:33 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
856dff8
Parents:
5339a87
Message:

Distribution now correctly handles libcfa but requires handcrafted Makefile.
This is a step forward but can't work in practice

Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r5339a87 rb7fe2e6  
    2121
    2222SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
    23 DIST_SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@ benchmark longrun_tests tests tools tools/prettyprinter
     23DIST_SUBDIRS = driver src . libcfa benchmark longrun_tests tests tools tools/prettyprinter
    2424
    2525@LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure
    … …  
    3333
    3434man1_MANS = doc/man/cfa.1
     35
     36EXTRA_DIST = LICENSE doc/man/cfa.1 libcfa/configure automake
    3537
    3638debug=yes

  • libcfa/Makefile.am

    r5339a87 rb7fe2e6  
    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

    r5339a87 rb7fe2e6  
    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

    r5339a87 rb7fe2e6  
    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
    2222cfalibdir = ${CFA_LIBDIR}
    2323cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c defines.hfa
     24
     25EXTRA_DIST = bootloader.cf builtins.c builtins.def extras.c extras.regx extras.regx2 prelude-gen.cc prototypes.awk prototypes.c prototypes.sed sync-builtins.cf
    2426
    2527CC = @LOCAL_CFACC@

  • libcfa/src/Makefile.am

    r5339a87 rb7fe2e6  
    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
    … …  
    3131# AM_CFAFLAGS for only cfa source
    3232# use -no-include-stdhdr to prevent rebuild cycles
    33 # The built sources must not depend on the installed headers
     33# The built sources must not depend on the installed inst_headers_src
    3434AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
    3535AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    3939#----------------------------------------------------------------------------------------------------------------
    4040if BUILDLIB
    41 headers_nosrc = bitmanip.hfa exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
    42                 bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa \
    43                 containers/list.hfa containers/stackLockFree.hfa concurrency/iofwd.hfa
     41inst_headers_nosrc = \
     42        bitmanip.hfa \
     43        clock.hfa \
     44        exception.hfa \
     45        gmp.hfa \
     46        math.hfa \
     47        time_t.hfa \
     48        bits/align.hfa \
     49        bits/containers.hfa \
     50        bits/debug.hfa \
     51        bits/defs.hfa \
     52        bits/locks.hfa \
     53        concurrency/iofwd.hfa \
     54        containers/list.hfa \
     55        containers/stackLockFree.hfa
    4456
    45 headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa \
    46                 time.hfa stdlib.hfa parseargs.hfa \
    47                 containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     57inst_headers_src = \
     58        common.hfa \
     59        fstream.hfa \
     60        heap.hfa \
     61        iostream.hfa \
     62        iterator.hfa \
     63        limits.hfa \
     64        parseargs.hfa \
     65        rational.hfa \
     66        stdlib.hfa \
     67        time.hfa \
     68        containers/maybe.hfa \
     69        containers/pair.hfa \
     70        containers/result.hfa \
     71        containers/vector.hfa
    4872
    49 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c ${headers:.hfa=.cfa}
     73libsrc = ${inst_headers_src} ${inst_headers_src:.hfa=.cfa} \
     74        assert.cfa \
     75        bits/algorithm.hfa \
     76        bits/debug.cfa \
     77        exception.c \
     78        exception.h \
     79        interpose.cfa \
     80        lsda.h \
     81        startup.cfa \
     82        startup.hfa \
     83        virtual.c \
     84        virtual.h
    5085
    5186# not all platforms support concurrency, add option do disable it
    52 thread_headers_nosrc = bits/random.hfa concurrency/invoke.h concurrency/kernel/fwd.hfa
     87inst_thread_headers_nosrc = \
     88        bits/random.hfa \
     89        concurrency/invoke.h \
     90        concurrency/kernel/fwd.hfa
    5391
    54 thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa \
    55                 concurrency/monitor.hfa concurrency/mutex.hfa
     92inst_thread_headers_src = \
     93        concurrency/coroutine.hfa \
     94        concurrency/kernel.hfa \
     95        concurrency/monitor.hfa \
     96        concurrency/mutex.hfa \
     97        concurrency/thread.hfa
    5698
    57 thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    58                 concurrency/invoke.c concurrency/io.cfa concurrency/iocall.cfa \
    59                 concurrency/io/setup.cfa \
    60                 concurrency/kernel/startup.cfa concurrency/preemption.cfa \
    61                 concurrency/ready_queue.cfa concurrency/stats.cfa \
    62                 ${thread_headers:.hfa=.cfa}
     99thread_libsrc = ${inst_thread_headers_src} ${inst_thread_headers_src:.hfa=.cfa} \
     100        bits/signal.hfa \
     101        concurrency/alarm.cfa \
     102        concurrency/alarm.hfa \
     103        concurrency/CtxSwitch-@ARCHITECTURE@.S \
     104        concurrency/invoke.c \
     105        concurrency/io.cfa \
     106        concurrency/io/setup.cfa \
     107        concurrency/io/types.hfa \
     108        concurrency/iocall.cfa \
     109        concurrency/iofwd.hfa \
     110        concurrency/kernel_private.hfa \
     111        concurrency/kernel/startup.cfa \
     112        concurrency/preemption.cfa \
     113        concurrency/preemption.hfa \
     114        concurrency/ready_queue.cfa \
     115        concurrency/ready_subqueue.hfa \
     116        concurrency/snzi.hfa \
     117        concurrency/stats.cfa \
     118        concurrency/stats.hfa \
     119        concurrency/stats.hfa
     120
    63121else
    64 headers =
    65 thread_headers =
    66 headers_nosrc =
    67 thread_headers_nosrc =
     122inst_headers_src =
     123inst_thread_headers_src =
     124inst_headers_nosrc =
     125inst_thread_headers_nosrc =
    68126libsrc =
    69127endif
    … …  
    125183
    126184cfa_includedir = $(CFA_INCDIR)
    127 nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
     185nobase_cfa_include_HEADERS = ${stdhdr} ${inst_headers_src} ${inst_headers_nosrc} ${inst_thread_headers_src} ${inst_thread_headers_nosrc}
     186EXTRA_DIST = stdhdr
    128187
    129188#----------------------------------------------------------------------------------------------------------------

  • src/Makefile.am

    r5339a87 rb7fe2e6  
    6868___driver_cfa_cpp_SOURCES = $(SRC)
    6969___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
    70 EXTRA_DIST = include/cassert include/optional
     70EXTRA_DIST = include/cassert include/optional BasicTypes-gen.cc
    7171
    7272AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)

  • tests/Makefile.am

    r5339a87 rb7fe2e6  
    6767avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
    6868# automake doesn't know we still need C/CPP rules so pretend like we have a C program
    69 _dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
     69nodist__dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
    7070
    7171#----------------------------------------------------------------------------------------------------------------

  • tools/Makefile.am

    r5339a87 rb7fe2e6  
    2121
    2222noinst_PROGRAMS = busy catchsig repeat watchdog
     23EXTRA_DIST = build/distcc_hash build/push2dist.sh
    2324
    24 busy_SOURCES     = busy.c
    25 busy_LDFLAGS     = -pthread
    26 catchsig_SOURCES = catchsig.c
    27 repeat_SOURCES   = repeat.c
    28 watchdog_SOURCES = watchdog.c
     25nodist_busy_SOURCES     = busy.c
     26nodist_busy_LDFLAGS     = -pthread
     27nodist_catchsig_SOURCES = catchsig.c
     28nodist_repeat_SOURCES   = repeat.c
     29nodist_watchdog_SOURCES = watchdog.c

  • tools/prettyprinter/Makefile.am

    r5339a87 rb7fe2e6  
    3030tools_prettyprinter_PROGRAMS = pretty
    3131tools_prettyprinterdir = ../
    32 pretty_SOURCES = ${SRC}
     32nodist_pretty_SOURCES = ${SRC}
    3333pretty_LDADD = ${LEXLIB} -ldl                   # yywrap
    3434pretty_CXXFLAGS = -Wno-deprecated -Wall -DYY_NO_INPUT -O2 -g -std=c++14
Note: See TracChangeset for help on using the changeset viewer.