Changeset 3d50aaf


Ignore:
Timestamp:
Dec 13, 2016, 11:35:53 AM (5 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:
0edebf8
Parents:
24f4671
Message:

Build process now properly only builds libcfa.a and libcfa-d.a according to configure (both libs are still the same)

Location:
src/libcfa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r24f4671 r3d50aaf  
    1818AUTOMAKE_OPTIONS = subdir-objects
    1919
    20 lib_LIBRARIES = libcfa.a
     20lib_LIBRARIES =
     21
     22if BUILD_RELEASE
     23lib_LIBRARIES += libcfa.a
     24endif
     25
     26if BUILD_DEBUG
     27lib_LIBRARIES += libcfa-d.a
     28endif
    2129
    2230# put into lib for now
     
    7886${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    7987
    80 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     88libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     89
     90libcfa_a_SOURCES = ${libsrc}
     91
     92libcfa_d_a_SOURCES = ${libsrc}
    8193
    8294stdhdr = ${shell echo stdhdr/*}
  • src/libcfa/Makefile.in

    r24f4671 r3d50aaf  
    4040build_triplet = @build@
    4141host_triplet = @host@
     42@BUILD_RELEASE_TRUE@am__append_1 = libcfa.a
     43@BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
    4244subdir = src/libcfa
    4345DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
     
    8991am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
    9092am__v_at_0 = @
    91 libcfa_a_AR = $(AR) $(ARFLAGS)
    92 libcfa_a_LIBADD =
     93libcfa_d_a_AR = $(AR) $(ARFLAGS)
     94libcfa_d_a_LIBADD =
    9395am__dirstamp = $(am__leading_dot)dirstamp
    9496am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
     
    9698        rational.$(OBJEXT) assert.$(OBJEXT) \
    9799        containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
    98 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
     100am__objects_2 = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    99101        concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    100102        concurrency/invoke.$(OBJEXT)
     103am_libcfa_d_a_OBJECTS = $(am__objects_2)
     104libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
     105libcfa_a_AR = $(AR) $(ARFLAGS)
     106libcfa_a_LIBADD =
     107am_libcfa_a_OBJECTS = $(am__objects_2)
    101108libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    102109DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     
    122129am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
    123130am__v_GEN_0 = @echo "  GEN   " $@;
    124 SOURCES = $(libcfa_a_SOURCES)
    125 DIST_SOURCES = $(libcfa_a_SOURCES)
     131SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
     132DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    126133DATA = $(cfalib_DATA)
    127134HEADERS = $(nobase_include_HEADERS)
     
    250257# create object files in directory with source files
    251258AUTOMAKE_OPTIONS = subdir-objects
    252 lib_LIBRARIES = libcfa.a
     259lib_LIBRARIES = $(am__append_1) $(am__append_2)
    253260
    254261# put into lib for now
     
    268275runtimehdrs = concurrency
    269276libobjs = ${headers:=.o}
    270 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     277libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     278libcfa_a_SOURCES = ${libsrc}
     279libcfa_d_a_SOURCES = ${libsrc}
    271280stdhdr = ${shell echo stdhdr/*}
    272281nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
     
    357366concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
    358367        concurrency/$(DEPDIR)/$(am__dirstamp)
     368libcfa-d.a: $(libcfa_d_a_OBJECTS) $(libcfa_d_a_DEPENDENCIES) $(EXTRA_libcfa_d_a_DEPENDENCIES)
     369        $(AM_V_at)-rm -f libcfa-d.a
     370        $(AM_V_AR)$(libcfa_d_a_AR) libcfa-d.a $(libcfa_d_a_OBJECTS) $(libcfa_d_a_LIBADD)
     371        $(AM_V_at)$(RANLIB) libcfa-d.a
    359372libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
    360373        $(AM_V_at)-rm -f libcfa.a
Note: See TracChangeset for help on using the changeset viewer.