Skip to content

Commit

Permalink
GitHub was getting confused about some files
Browse files Browse the repository at this point in the history
also fix distcleaning
  • Loading branch information
cooljeanius committed Oct 25, 2023
1 parent 659524f commit d40ba17
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,7 @@ lib-src/rcs2log diff=shell

# Gnulib's git-merge-changelog driver:
ChangeLog merge=cl-merge

# Teach linguist about some files:
etc/TUTORIAL.* linguist-language=text
etc/tutorials/TUTORIAL* linguist-language=text
3 changes: 3 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ on:
branches:
- master
- dependabot/*
paths-ignore:
- /etc/TUTORIAL.es
- /etc/tutorials/TUTORIAL.es
pull_request:
# The branches below must be a subset of the branches above
branches:
Expand Down
7 changes: 6 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,13 @@ distclean: FRC distclean-local
cd mac && $(MAKE) $(MFLAGS) distclean
cd nextstep && $(MAKE) $(MFLAGS) distclean
for dir in test/automated admin admin/grammars admin/unidata; do \
[ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) distclean); \
if test -d $${dir} && test -r $${dir}/Makefile; then \
cd $${dir} && $(MAKE) $(MFLAGS) distclean; \
else \
echo "skipping making distclean in $${dir}"; \
fi; \
done
@echo "top-level distclean: top_distclean is: ${top_distclean}"
${top_distclean}

### `bootstrap-clean'
Expand Down
2 changes: 2 additions & 0 deletions admin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ extraclean: maintainer-clean
.PHONY: extraclean

distclean-local:
@echo "making distclean-local in `pwd`"
-rm -rf *.dSYM || rmdir *.dSYM
-rm -rf .deps || rmdir .deps
.PHONY: distclean-local
1 change: 1 addition & 0 deletions admin/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -2805,6 +2805,7 @@ extraclean: maintainer-clean

distclean-local:
-rm -rf *.dSYM || rmdir *.dSYM
-rm -rf .deps || rmdir .deps
.PHONY: distclean-local

# Tell versions [3.59,3.63) of GNU make to not export all variables.
Expand Down
1 change: 1 addition & 0 deletions admin/unidata/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ clean:
bootstrap-clean: clean

distclean: clean
@echo "making distclean in `pwd`
if test -e Makefile; then rm -f Makefile; fi

maintainer-clean: distclean
Expand Down
1 change: 1 addition & 0 deletions doc/coverage/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#
1 change: 1 addition & 0 deletions etc/TUTORIAL.es
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,7 @@ compartiendo software libre!
--- end of TUTORIAL.es ---

;;; Local Variables:
;;; mode: text;
;;; coding: latin-1
;;; End:

Expand Down
1 change: 1 addition & 0 deletions etc/tutorials/TUTORIAL.es
Original file line number Diff line number Diff line change
Expand Up @@ -1226,5 +1226,6 @@ compartiendo software libre!
--- end of TUTORIAL.es ---

;;; Local Variables:
;;; mode: text;
;;; coding: utf-8
;;; End:
9 changes: 8 additions & 1 deletion lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,16 @@ headers: $(BUILT_SOURCES)
.PHONY: headers

bootstrap-clean: maintainer-clean
@echo "no bootstrap-clean specific rules yet."
@echo "no bootstrap-clean specific rules (for `pwd`) yet."
.PHONY: bootstrap-clean

distclean-local:
@echo "making distclean-local in `pwd`"
-rm -rf .deps || rmdir .deps
-rm -rf $(srcdr)/*/.deps || rmdir $(srcdir)/*/.deps
-rm -rf $(builddir)/*/.deps || rmdir $(builddir)/*/.deps
.PHONY: distclean-local

maintainer-clean-local:
rm -rf glthread || rmdir glthread
.PHONY: maintainer-clean-local
Expand Down
33 changes: 20 additions & 13 deletions lib/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -4406,7 +4406,7 @@ distclean: distclean-am
-rm -f uniwidth/$(DEPDIR)/width.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
distclean-local distclean-tags

dvi: dvi-am

Expand Down Expand Up @@ -4726,17 +4726,17 @@ uninstall-am:
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-generic clean-libtool clean-noinstLIBRARIES \
cscopelist-am ctags ctags-am distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic maintainer-clean-local mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
distclean-generic distclean-libtool distclean-local \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic \
maintainer-clean-local mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
pdf-am ps ps-am tags tags-am uninstall uninstall-am

.PRECIOUS: Makefile

Expand Down Expand Up @@ -7167,9 +7167,16 @@ headers: $(BUILT_SOURCES)
.PHONY: headers

bootstrap-clean: maintainer-clean
@echo "no bootstrap-clean specific rules yet."
@echo "no bootstrap-clean specific rules (for `pwd`) yet."
.PHONY: bootstrap-clean

distclean-local:
@echo "making distclean-local in `pwd`"
-rm -rf .deps || rmdir .deps
-rm -rf $(srcdr)/*/.deps || rmdir $(srcdir)/*/.deps
-rm -rf $(builddir)/*/.deps || rmdir $(builddir)/*/.deps
.PHONY: distclean-local

maintainer-clean-local:
rm -rf glthread || rmdir glthread
.PHONY: maintainer-clean-local
Expand Down

0 comments on commit d40ba17

Please sign in to comment.