Changeset a9fb796 for libcfa/src

Timestamp:

Sep 18, 2018, 4:23:45 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

56b53b2

Parents:

0982a05

Message:

Fixed libcfa dependencies

Location:

libcfa/src

Files:

• Makefile.am (modified) (5 diffs)
• Makefile.in (modified) (11 diffs)

libcfa/src/Makefile.am

@@ -16 +16 @@
 
 # create object files in directory with source files
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = foreign subdir-objects
 ARFLAGS = cr
 
@@ -24 +24 @@
 lib_LIBRARIES =  libcfa.a
 
+VPATH += :../prelude
+
 # 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 -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -40 +42 @@
 headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
 
-libobjs = ${headers:.hfa=.o}
-libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
-        ${headers:.hfa=.cfa}
+libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
 
 # not all platforms support concurrency, add option do disable it
@@ -49 +49 @@
 #----------------------------------------------------------------------------------------------------------------
 # add dependency to cfa-cpp so all libraries are rebuilt with new translator
-${libobjs} : ${cfalib_DATA}
+#@CFACC@ @CFACPP@ prelude.cf
 
-libcfa_a_SOURCES = ${libsrc}
+# add dependency of cfa files
+libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
+$(libobjs) : @CFACC@ @CFACPP@ prelude.cf
+
+
+# .deps inclusion is not done automatically by automake for new languages
+libdeps = $(join \
+        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
+        $(notdir ${libobjs:.o=.Po}) \
+)
+
+-include $(libdeps)
+
+prelude.o : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -in-tree -XCFA -l ${<} -c -o ${@}
+
+
+
+#----------------------------------------------------------------------------------------------------------------
+libcfa_a_SOURCES = prelude.o ${libsrc}
 
 stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
@@ -69 +88 @@
         concurrency/invoke.h
 
-MOSTLYCLEANFILES = prelude.c
-
 #----------------------------------------------------------------------------------------------------------------
 maintainer-clean-local:
         -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
+
+
+# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+#       $(am__mv) $$depbase.Tpo $$depbase.Po

libcfa/src/Makefile.in

@@ -19 +19 @@
 
 
-VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -147 +146 @@
         concurrency/kernel.$(OBJEXT) concurrency/monitor.$(OBJEXT) \
         concurrency/mutex.$(OBJEXT)
-am__objects_2 = prelude.$(OBJEXT) startup.$(OBJEXT) \
-        interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \
-        exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \
-        $(am__objects_1) \
+am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
+        bits/debug.$(OBJEXT) assert.$(OBJEXT) exception.$(OBJEXT) \
+        virtual.$(OBJEXT) heap.$(OBJEXT) $(am__objects_1) \
         concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
         concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
@@ -220 +218 @@
         $(top_srcdir)/./automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+VPATH = @srcdir@ :../prelude
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -328 +327 @@
 
 # create object files in directory with source files
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = foreign subdir-objects
 ARFLAGS = cr
 CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -341 +340 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -354 +353 @@
         concurrency/thread.hfa concurrency/kernel.hfa \
         concurrency/monitor.hfa concurrency/mutex.hfa
-libobjs = ${headers:.hfa=.o}
 
 # not all platforms support concurrency, add option do disable it
-libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
+libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
         exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
         concurrency/invoke.c concurrency/preemption.cfa
-libcfa_a_SOURCES = ${libsrc}
+
+#----------------------------------------------------------------------------------------------------------------
+# add dependency to cfa-cpp so all libraries are rebuilt with new translator
+#@CFACC@ @CFACPP@ prelude.cf
+
+# add dependency of cfa files
+libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
+
+# .deps inclusion is not done automatically by automake for new languages
+libdeps = $(join \
+        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
+        $(notdir ${libobjs:.o=.Po}) \
+)
+
+
+#----------------------------------------------------------------------------------------------------------------
+libcfa_a_SOURCES = prelude.o ${libsrc}
 stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
 cfa_includedir = $(CFA_INCDIR)
@@ -377 +391 @@
         concurrency/invoke.h
 
-MOSTLYCLEANFILES = prelude.c
 all: all-am
 
@@ -506 +519 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@
@@ -676 +688 @@
         fi
 mostlyclean-generic:
-        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
@@ -784 +795 @@
 
 
-.cfa.o: $(CFACC) $(CFACPP)
+.cfa.o:
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
         $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
         $(am__mv) $$depbase.Tpo $$depbase.Po
-
-#----------------------------------------------------------------------------------------------------------------
-# add dependency to cfa-cpp so all libraries are rebuilt with new translator
-${libobjs} : ${cfalib_DATA}
+$(libobjs) : @CFACC@ @CFACPP@ prelude.cf
+
+-include $(libdeps)
+
+prelude.o : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -in-tree -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------
@@ -797 +810 @@
         -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
 
+# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+#       $(am__mv) $$depbase.Tpo $$depbase.Po
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.