Changeset 95b8aa7 for libcfa/src/Makefile.am

Timestamp:

Jan 11, 2019, 3:36:48 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

e1f7eef

Parents:

ff5caaf (diff), 52ffa30 (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:

Pull fixes for deferred_resn from other branch

File:

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

libcfa/src/Makefile.am

@@ -17 +17 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = foreign subdir-objects
-ARFLAGS = cr
+ACLOCAL_AMFLAGS  = -I automake
 
 include $(srcdir)/../../src/cfa.make
 
 libdir = ${CFA_LIBDIR}
-lib_LIBRARIES =  libcfa.a
+lib_LTLIBRARIES =  libcfa.la
 
 VPATH += :../prelude
@@ -31 +31 @@
 # The built sources must not depend on the installed headers
 AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
-AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
+AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 CFACC = @CFACC@
@@ -37 +37 @@
 #----------------------------------------------------------------------------------------------------------------
 if BUILDLIB
+headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
           containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
-headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
-
 # not all platforms support concurrency, add option do disable it
+headers_nosrc += concurrency/invoke.h
 headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
-
-headers_nosrc += concurrency/invoke.h
 
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
@@ -63 +61 @@
 
 # add dependency of cfa files
-libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
+libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
 
@@ -70 +68 @@
 libdeps = $(join \
         $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
-        $(notdir ${libobjs:.o=.Po}) \
+        $(notdir ${libobjs:.lo=.Plo}) \
 )
 
@@ -76 +74 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
-        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
+        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
 
+prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+        @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
 
 
 #----------------------------------------------------------------------------------------------------------------
-libcfa_a_SOURCES = prelude.cfa ${libsrc}
+libcfa_la_SOURCES = prelude.cfa ${libsrc}
+libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
 
-stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
+stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 
 cfa_includedir = $(CFA_INCDIR)