Ignore:
Timestamp:
Jul 27, 2017, 2:56:39 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
874960b
Parents:
4d4e5de (diff), a04ce4d (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r4d4e5de rfcd17b2f  
    1010## Author           : Peter A. Buhr
    1111## Created On       : Sun May 31 08:54:01 2015
    12 ## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Thu Jul 20 23:09:34 2017
    14 ## Update Count     : 220
     12## Last Modified By : Andrew Beach
     13## Last Modified On : Wed Jul 26 14:15:00 2017
     14## Update Count     : 221
    1515###############################################################################
    1616
     
    5656libobjs = ${headers:=.o}
    5757libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} \
    58          assert.c exception.c typeobject.c
     58         assert.c exception.c virtual.c
    5959
    6060# not all platforms support concurrency, add option do disable it
     
    7373        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
    7474
    75 libcfa_a-typeobject.o : typeobject.c
     75libcfa_a-virtual.o : virtual.c
    7676        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
    7777
     
    8282        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    8383
    84 libcfa_d_a-typeobject.o : typeobject.c
     84libcfa_d_a-virtual.o : virtual.c
    8585        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    8686
Note: See TracChangeset for help on using the changeset viewer.