Changes in libcfa/src/Makefile.am [b7fe2e6:d119d613]

File:

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

libcfa/src/Makefile.am

@@ -17 +17 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS  = -I ../automake
+ACLOCAL_AMFLAGS  = -I automake
 
 include $(top_srcdir)/../tools/build/cfa.make
@@ -31 +31 @@
 # AM_CFAFLAGS for only cfa source
 # use -no-include-stdhdr to prevent rebuild cycles
-# The built sources must not depend on the installed inst_headers_src
+# The built sources must not depend on the installed headers
 AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -39 +39 @@
 #----------------------------------------------------------------------------------------------------------------
 if BUILDLIB
-inst_headers_nosrc = \
-        bitmanip.hfa \
-        clock.hfa \
-        exception.hfa \
-        gmp.hfa \
-        math.hfa \
-        time_t.hfa \
-        bits/align.hfa \
-        bits/containers.hfa \
-        bits/debug.hfa \
-        bits/defs.hfa \
-        bits/locks.hfa \
-        concurrency/iofwd.hfa \
-        containers/list.hfa \
-        containers/stackLockFree.hfa
+headers_nosrc = bitmanip.hfa exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
+                bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa \
+                containers/list.hfa containers/stackLockFree.hfa concurrency/iofwd.hfa
 
-inst_headers_src = \
-        common.hfa \
-        fstream.hfa \
-        heap.hfa \
-        iostream.hfa \
-        iterator.hfa \
-        limits.hfa \
-        parseargs.hfa \
-        rational.hfa \
-        stdlib.hfa \
-        time.hfa \
-        containers/maybe.hfa \
-        containers/pair.hfa \
-        containers/result.hfa \
-        containers/vector.hfa
+headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa \
+                time.hfa stdlib.hfa parseargs.hfa \
+                containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
-libsrc = ${inst_headers_src} ${inst_headers_src:.hfa=.cfa} \
-        assert.cfa \
-        bits/algorithm.hfa \
-        bits/debug.cfa \
-        exception.c \
-        exception.h \
-        interpose.cfa \
-        lsda.h \
-        startup.cfa \
-        startup.hfa \
-        virtual.c \
-        virtual.h
+libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c ${headers:.hfa=.cfa}
 
 # not all platforms support concurrency, add option do disable it
-inst_thread_headers_nosrc = \
-        bits/random.hfa \
-        concurrency/invoke.h \
-        concurrency/kernel/fwd.hfa
+thread_headers_nosrc = bits/random.hfa concurrency/invoke.h concurrency/kernel/fwd.hfa
 
-inst_thread_headers_src = \
-        concurrency/coroutine.hfa \
-        concurrency/kernel.hfa \
-        concurrency/monitor.hfa \
-        concurrency/mutex.hfa \
-        concurrency/thread.hfa
+thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa \
+                concurrency/monitor.hfa concurrency/mutex.hfa concurrency/exception.hfa
 
-thread_libsrc = ${inst_thread_headers_src} ${inst_thread_headers_src:.hfa=.cfa} \
-        bits/signal.hfa \
-        concurrency/alarm.cfa \
-        concurrency/alarm.hfa \
-        concurrency/CtxSwitch-@ARCHITECTURE@.S \
-        concurrency/invoke.c \
-        concurrency/io.cfa \
-        concurrency/io/setup.cfa \
-        concurrency/io/types.hfa \
-        concurrency/iocall.cfa \
-        concurrency/iofwd.hfa \
-        concurrency/kernel_private.hfa \
-        concurrency/kernel/startup.cfa \
-        concurrency/preemption.cfa \
-        concurrency/preemption.hfa \
-        concurrency/ready_queue.cfa \
-        concurrency/ready_subqueue.hfa \
-        concurrency/snzi.hfa \
-        concurrency/stats.cfa \
-        concurrency/stats.hfa \
-        concurrency/stats.hfa
-
+thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
+                concurrency/invoke.c concurrency/io.cfa concurrency/iocall.cfa \
+                concurrency/io/setup.cfa \
+                concurrency/kernel/startup.cfa concurrency/preemption.cfa \
+                concurrency/ready_queue.cfa concurrency/stats.cfa \
+                ${thread_headers:.hfa=.cfa}
 else
-inst_headers_src =
-inst_thread_headers_src =
-inst_headers_nosrc =
-inst_thread_headers_nosrc =
+headers =
+thread_headers =
+headers_nosrc =
+thread_headers_nosrc =
 libsrc =
 endif
@@ -173 +115 @@
 
 #----------------------------------------------------------------------------------------------------------------
-libcfa_la_SOURCES = ${libsrc}
-nodist_libcfa_la_SOURCES = prelude.cfa
+libcfa_la_SOURCES = prelude.cfa ${libsrc}
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
 
@@ -183 +124 @@
 
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${stdhdr} ${inst_headers_src} ${inst_headers_nosrc} ${inst_thread_headers_src} ${inst_thread_headers_nosrc}
-EXTRA_DIST = stdhdr
+nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
 
 #----------------------------------------------------------------------------------------------------------------