Changeset c59712e for libcfa/src/Makefile.am

Timestamp:

Aug 3, 2018, 11:25:46 AM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ff1e0f38

Parents:

25a9b5a

Message:

Parent make now seems to properly call libcfa

File:

• libcfa/src/Makefile.am (modified) (5 diffs)

libcfa/src/Makefile.am

@@ -20 +20 @@
 
 libdir = ${CFA_LIBDIR}
-lib_LIBRARIES =
+lib_LIBRARIES =  libcfa.a
 
-if BUILD_RELEASE
-lib_LIBRARIES += libcfa.a
-endif
-
-if BUILD_DEBUG
-lib_LIBRARIES += libcfa-d.a
-endif
-
-libcfa_a-libcfa-prelude.o : libcfa-prelude.c
+libcfa-prelude.o : libcfa-prelude.c
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -Wall -O2 -c -o $@ $<
-
-libcfa_d_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -Wall -O0 -c -o $@ $<
 
 EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@ $(DEFAULT_INCLUDES)
@@ -50 +39 @@
 
 # not all platforms support concurrency, add option do disable it
-if BUILD_CONCURRENCY
 headers += concurrency/coroutine concurrency/thread concurrency/kernel concurrency/monitor concurrency/mutex
-endif
 
 libobjs = ${headers:=.o}
@@ -59 +46 @@
 
 # not all platforms support concurrency, add option do disable it
-if BUILD_CONCURRENCY
 libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/preemption.c
-endif
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
@@ -74 +59 @@
         false
 
-concurrency/libcfa_a-invoke.o : concurrency/invoke.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-
-libcfa_a-exception.o : exception.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-
-libcfa_a-virtual.o : virtual.c
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
-
-concurrency/libcfa_d_a-invoke.o : concurrency/invoke.c
+concurrency/invoke.o : concurrency/invoke.c
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
 
-libcfa_d_a-exception.o : exception.c
+exception.o : exception.c
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
 
-libcfa_d_a-virtual.o : virtual.c
+virtual.o : virtual.c
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
 
@@ -96 +72 @@
 libcfa_a_SOURCES = ${libsrc}
 libcfa_a_CFLAGS = -nodebug -O2
-libcfa_d_a_SOURCES = ${libsrc}
-libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
 
 stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}