Changeset 49205cf

Timestamp:

May 25, 2015, 4:54:30 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

5d6ce1f

Parents:

367e082 (diff), 448f9b2 (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' into assignment-const-field

File:

• libcfa/Makefile.in (modified) (3 diffs)

libcfa/Makefile.in

@@ -11 +11 @@
 ## Created On       : Sat May 16 08:05:18 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon May 25 09:33:47 2015
-## Update Count     : 4
+## Last Modified On : Mon May 25 16:22:36 2015
+## Update Count     : 9
 ###############################################################################
 
@@ -19 +19 @@
 CFA_LIBDIR = @CFA_LIBDIR@
 
-LIBRARIES := libcfa.a builtins.cf
+LIBRARIES := libcfa.a
 
-all : ${LIBRARIES} Makefile
+all : ${LIBRARIES} builtins.cf Makefile
 
 install : all
@@ -30 +30 @@
 # make forward declarations for gcc builtins
 builtins.cf : builtins.c
-        @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@
+        @if [ -e builtins.c ] ; 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
         ${INSTALL} builtins.cf @CFA_LIBDIR@
 
-builtins.c : builtins.def
-        @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
+builtins.c : builtins.def prototypes.awk
+        @if [ -e builtins.def ] ; then \
+                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
+        fi
+
+builtins.def :
 
 libcfa-prelude.c : @CFA_LIBDIR@/cfa-cpp prelude.cf builtins.cf