Changeset c5a8c5b


Ignore:
Timestamp:
Dec 15, 2016, 10:58:04 AM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
c7800bfc
Parents:
74e5a3aa
Message:

Fixed makefile dependencies by using gcc -imacros flag

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/Makefile.am

    r74e5a3aa rc5a8c5b  
    3434         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
    3535
    36 EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr @CFA_FLAGS@
     36EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
    3737
    3838AM_CCASFLAGS = @CFA_FLAGS@
    … …  
    4747% : %.c
    4848        @true
    49 
    50 # %.$(OJBEXT) : libcfa-prelude.c
    51 #       echo "FRED"
    52 #       @false
    53 #       ${AM_V_CC} ${abs_top_srcdir}/src/driver/cfa
    5449
    5550concurrency/libcfa_a-invoke.o : concurrency/invoke.c

  • src/libcfa/Makefile.in

    r74e5a3aa rc5a8c5b  
    270270AUTOMAKE_OPTIONS = subdir-objects
    271271lib_LIBRARIES = $(am__append_1) $(am__append_2)
    272 EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr @CFA_FLAGS@
     272EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
    273273AM_CCASFLAGS = @CFA_FLAGS@
    274274headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
    … …  
    10051005        @true
    10061006
    1007 # %.$(OJBEXT) : libcfa-prelude.c
    1008 #       echo "FRED"
    1009 #       @false
    1010 #       ${AM_V_CC} ${abs_top_srcdir}/src/driver/cfa
    1011 
    10121007concurrency/libcfa_a-invoke.o : concurrency/invoke.c
    10131008        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<

  • src/prelude/Makefile.am

    r74e5a3aa rc5a8c5b  
    4242prototypes.awk :
    4343
    44 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf
     44../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    4545        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    4646

  • src/prelude/Makefile.in

    r74e5a3aa rc5a8c5b  
    438438prototypes.awk :
    439439
    440 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf
     440../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    441441        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    442442
Note: See TracChangeset for help on using the changeset viewer.