Changeset 5c6768e


Ignore:
Timestamp:
Jun 8, 2016, 2:27:29 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
abc26975
Parents:
8c8c2d9 (diff), 905cf4b (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.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
src/libcfa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r8c8c2d9 r5c6768e  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Jun  7 14:38:18 2016
    14 ## Update Count     : 142
     13## Last Modified On : Wed Jun  8 14:20:34 2016
     14## Update Count     : 165
    1515###############################################################################
    1616
     
    5454
    5555headers = limits stdlib math iostream fstream iterator rational
    56 .PRECIOUS : ${headers}                                          # stop implicit '.o' rules from removing extensionless headers
     56libobjs = ${headers:=.o}
    5757
    58 #.SECONDARY : ${headers}                                        # stop implicit '.o' rules from removing extensionless headers
     58# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     59% : %.c
     60        @true
    5961
     62${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp       # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    6063
    6164libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
  • src/libcfa/Makefile.in

    r8c8c2d9 r5c6768e  
    215215        ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
    216216headers = limits stdlib math iostream fstream iterator rational
     217libobjs = ${headers:=.o}
    217218libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
    218219include_HEADERS = ${headers}
     
    587588libcfa-prelude.o : libcfa-prelude.c
    588589        @BACKEND_CC@ -c -o $@ $<
    589 .SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
     590
     591# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     592% : %.c
     593        @true
     594
     595${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp       # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    590596
    591597# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.