Changeset c2bc6d5

Timestamp:

Aug 24, 2020, 5:38:17 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5339a87

Parents:

97cba9f

Message:

Minor fixes to make files to support dist target

Files:

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

Makefile.am

@@ -21 +21 @@
 
 SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
+DIST_SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@ benchmark longrun_tests tests tools tools/prettyprinter
 
 @LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure

benchmark/Makefile.am

@@ -66 +66 @@
 # Dummy hack tricks
 EXTRA_PROGRAMS = dummy # build but do not install
-dummy_SOURCES = dummyC.c dummyCXX.cpp
+nodist_dummy_SOURCES = dummyC.c dummyCXX.cpp
 
 dummyC.c:
@@ -80 +80 @@
 ## =========================================================================================================
 
-all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
+# all is used by make dist so ignore it
+all:
+
+all-bench : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
 
 basic_loop_DURATION = 15000000000
@@ -476 +479 @@
 ## =========================================================================================================
 
-compile$(EXEEXT) :              \
+bcompile$(EXEEXT) :             \
         compile-array.make      \
         compile-attributes.make \

libcfa/src/Makefile.am

@@ -115 +115 @@
 
 #----------------------------------------------------------------------------------------------------------------
-libcfa_la_SOURCES = prelude.cfa ${libsrc}
+libcfa_la_SOURCES = ${libsrc}
+nodist_libcfa_la_SOURCES = prelude.cfa
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@