Changeset 2a59655

Timestamp:

Dec 9, 2020, 3:01:28 PM (3 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:

1a2a49b

Parents:

d7a10af

Message:

make distcheck FINALLY passes

Files:

• Makefile.am (modified) (2 diffs)
• driver/Makefile.am (modified) (1 diff)
• libcfa/prelude/Makefile.am (modified) (1 diff)
• libcfa/src/Makefile.am (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)

Makefile.am

@@ -19 +19 @@
 
 MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/* # order important
+DISTCLEANFILES = version
 
 SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
@@ -50 +51 @@
         @./config.status --config | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
         @find libcfa -name config.status -printf "\n%h\n\t" -exec {} --config \; | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
+
+mostlyclean-local: @LIBCFA_TARGET_MAKEFILES@
+        for dir in @LIBCFA_TARGET_DIRS@; do \
+                $(MAKE) -C $${dir} mostlyclean; \
+        done
+
+clean-local: @LIBCFA_TARGET_MAKEFILES@
+        for dir in @LIBCFA_TARGET_DIRS@; do \
+                $(MAKE) -C $${dir} clean; \
+        done
+
+distclean-local: @LIBCFA_TARGET_MAKEFILES@
+        for dir in @LIBCFA_TARGET_DIRS@; do \
+                $(MAKE) -C $${dir} distclean; \
+                rm $${dir}/config.data; \
+        done

driver/Makefile.am

@@ -28 +28 @@
         @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
         @echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) cfa '$(CFA_BINDIR)/$(CFA_NAME)'"; \
+        chmod u+w $(CFA_BINDIR);\
         $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) cfa $(CFA_BINDIR)/$(CFA_NAME) || exit $$?
 

libcfa/prelude/Makefile.am

@@ -70 +70 @@
 
 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
+DISTCLEANFILES = $(DEPDIR)/builtins.Po
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
 

libcfa/src/Makefile.am

@@ -197 +197 @@
         -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
 
+distclean-local:
+        find ${builddir} -path '*.Plo' -delete
+
 
 # $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

tests/Makefile.am

@@ -102 +102 @@
         @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
-clean-local :
+mostlyclean-local :
         rm -f ${EXTRA_PROGRAMS}
+        rm -rf __pycache__
+        find ${builddir} -path '*.o' -delete
+        find ${builddir} -path '*/.err/*.log' -delete
+        find ${builddir} -path '*/.out/*.log' -delete
+
+distclean-local :
+        find ${builddir} -path '*.Po' -delete
 
 list :