Changes in src/libcfa/Makefile.am [c5a8c5b:6d665d9]

File:

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

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Dec 14 15:17:30 2016
-## Update Count     : 211
+## Last Modified On : Fri Aug 26 12:03:37 2016
+## Update Count     : 199
 ###############################################################################
 
@@ -18 +18 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-lib_LIBRARIES =
+lib_LIBRARIES = libcfa.a
 
-if BUILD_RELEASE
-lib_LIBRARIES += libcfa.a
-endif
+# put into lib for now
+cfalibdir = ${libdir}
+cfalib_DATA = builtins.cf extras.cf prelude.cf
 
-if BUILD_DEBUG
-lib_LIBRARIES += libcfa-d.a
-endif
+# create extra forward types/declarations to reduce inclusion of library files
+extras.cf : extras.regx extras.c
+        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
 
-libcfa_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -O2 -c -o $@ $<
+# create forward declarations for gcc builtins
+builtins.cf : builtins.c
+        ${AM_V_GEN}if [ -e $< ] ; then \
+                @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
+        fi
 
-libcfa_d_a-libcfa-prelude.o : libcfa-prelude.c
-         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
+builtins.c : builtins.def prototypes.awk
+        ${AM_V_GEN}if [ -e $< ] ; then \
+                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
+        fi
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+builtins.def :
 
-AM_CCASFLAGS = @CFA_FLAGS@
-CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
+prototypes.awk :
+
+MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+
+#--------------------------------------------------
+
+libcfa-prelude.c : ${srcdir}/prelude.cf ${srcdir}/extras.cf ${srcdir}/builtins.cf
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+
+libcfa-prelude.o : libcfa-prelude.c
+         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -c -o $@ $<
+
+CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
-runtimehdrs = concurrency
+headers = limits stdlib math iostream fstream iterator rational containers/vector
 libobjs = ${headers:=.o}
 
@@ -48 +63 @@
         @true
 
-concurrency/libcfa_a-invoke.o : concurrency/invoke.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
-        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
-
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
-libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
-
-libcfa_a_SOURCES = ${libsrc}
-libcfa_a_CFLAGS = -nodebug -O2
-libcfa_d_a_SOURCES = ${libsrc}
-libcfa_d_a_CFLAGS = -debug -O0
+libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 
 stdhdr = ${shell echo stdhdr/*}
 
-nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+nobase_include_HEADERS = ${headers} ${stdhdr}
 
 CLEANFILES = libcfa-prelude.c