Changeset ba9baad for libcfa/src/Makefile.am

Timestamp:

Aug 3, 2018, 2:50:12 PM (3 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, no_list, persistent-indexer

Children:

534e4e4

Parents:

ff1e0f38

Message:

Simplified some of the handling by converting libcfa sources from .c to .cfa

File:

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

libcfa/src/Makefile.am

@@ -19 +19 @@
 ARFLAGS = cr
 
+include $(srcdir)/../../src/cfa.make
+
 libdir = ${CFA_LIBDIR}
 lib_LIBRARIES =  libcfa.a
 
-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}gcc  -Wall -O2 -c -o $@ $<
-
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c  $(DEFAULT_INCLUDES)
-
-AM_CCASFLAGS =
-
-#CFLAGS for most libcfa src
-#use -no-include-stdhdr to prevent rebuild cycles
-#The built sources must not depend on the installed headers
-CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
-CC = @CFACC@
+# AM_CFLAGS for all cfa source
+# AM_CFAFLAGS for only cfa source
+# use -no-include-stdhdr to prevent rebuild cycles
+# The built sources must not depend on the installed headers
+AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -imacros prelude.c -I$(srcdir)/stdhdr
+AM_CFLAGS = -g -Wall -Wno-unused-function
+CFACC = @CFACC@
 
 headers = fstream iostream iterator limits rational time stdlib common \
@@ -42 +39 @@
 
 libobjs = ${headers:=.o}
-libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c \
-        ${headers:=.c}
+libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
+        ${headers:=.cfa}
 
 # not all platforms support concurrency, add option do disable it
-libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/preemption.c
+libsrc += concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
@@ -59 +56 @@
         false
 
-concurrency/invoke.o : concurrency/invoke.c
-        ${AM_V_CC}gcc -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
 
-exception.o : exception.c
-        ${AM_V_CC}gcc -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-
-virtual.o : virtual.c
-        ${AM_V_CC}gcc -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-
-${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
+${libobjs} : ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
 libcfa_a_SOURCES = ${libsrc}
-libcfa_a_CFLAGS = -nodebug -O2
 
 stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
@@ -89 +77 @@
         concurrency/invoke.h
 
-CLEANFILES = libcfa-prelude.c
+CLEANFILES = prelude.c
 
 maintainer-clean-local: