Skip to content

Adds compatibility layer for old MIUN makefiles #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dbosk wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Adds compatibility layer for old MIUN makefiles #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1c64a3
Adds first version of miun.compat.mk
dbosk Jan 10, 2018
33e430a
Merge branch 'master' into miun
dbosk Jan 10, 2018
78f550a
Don't remove miun.*.mk on clean
dbosk Jan 10, 2018
8756617
subdir.mk propagates INCLUDE_MAKEFILES as search path
dbosk Jan 11, 2018
ae3595e
Merge branch 'include' into miun
dbosk Jan 11, 2018
b10c556
Adds ifndef-header, changes :: to PHONY
dbosk Jan 11, 2018
4310e62
Updates miun.depend.mk
dbosk Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ results.tex
subdir.tex
tex.tex
transform.tex
miun.compat.tex
36 changes: 14 additions & 22 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ MKFILES+= pkg.mk pub.mk transform.mk
MKFILES+= tex.mk doc.mk
MKFILES+= noweb.mk haskell.mk
MKFILES+= exam.mk results.mk
#MKFILES+= miun.port.mk
MKFILES+= miun.compat.mk

MIUNFILES+= miun.docs.mk miun.tex.mk miun.subdir.mk
MIUNFILES+= miun.package.mk miun.pub.mk miun.course.mk
MIUNFILES+= miun.export.mk miun.results.mk latexmkrc
MIUNFILES+= miun.depend.mk
MIUNFILES+= miun.export.mk miun.results.mk miun.depend.mk

OTHERS+= latexmkrc
OTHERS+= gitattributes

.PHONY: all
all: makefiles.pdf
all: ${MKFILES}
#all: ${MIUNFILES}
all: ${MIUNFILES}
all: ${OTHERS}

makefiles.pdf: makefiles.tex preamble.tex intro.tex makefiles.bib
Expand All @@ -38,6 +37,12 @@ gitattributes: transform.mk.nw
notangle -t2 -R$@ $^ | cpif $@


miun.compat.tex: miun.compat.mk.nw

${MIUNFILES}: miun.compat.mk.nw
${NOTANGLE.mk}


.PHONY: clean
clean:
${RM} makefiles.pdf
Expand All @@ -54,14 +59,13 @@ clean:
${RM} haskell.tex
${RM} exam.tex
${RM} results.tex
# ${RM} miun.port.tex
${RM} miun.compat.tex


.PHONY: miun
miun: ${MIUNFILES}

#PKG_PACKAGES?= main miun
PKG_PACKAGES?= main
PKG_PACKAGES?= main miun

PKG_PREFIX= /usr/local
PKG_INSTALL_DIR= /include
Expand All @@ -70,25 +74,13 @@ PKG_NAME-main= makefiles
PKG_INSTALL_FILES-main= ${MKFILES}
PKG_TARBALL_FILES-main= ${PKG_INSTALL_FILES-main} ${OTHERS} Makefile README.md

#PKG_NAME-miun= build-all
#PKG_INSTALL_FILES-miun= ${MIUNFILES}
#PKG_TARBALL_FILES-miun= ${PKG_INSTALL_FILES-miun} Makefile README.md
#
#
#PUB_SITES?= miun
#
#PUB_SERVER-miun?= ver.miun.se
#PUB_DIR-miun?= /srv/web/svn
#PUB_CATEGORY-miun?= build
#PUB_METHOD-miun?= ssh
#PUB_GROUP-miun?= svn
#PUB_FILES-miun?= ${PKG_FILES-miun} ${PKG_NAME-miun}.tar.gz
PKG_NAME-miun= build-all
PKG_INSTALL_FILES-miun= ${MIUNFILES}
PKG_TARBALL_FILES-miun= ${PKG_INSTALL_FILES-miun} ${OTHERS} Makefile README.md


INCLUDE_MAKEFILES=.
include ${INCLUDE_MAKEFILES}/portability.mk
include ${INCLUDE_MAKEFILES}/noweb.mk
include ${INCLUDE_MAKEFILES}/tex.mk
include ${INCLUDE_MAKEFILES}/pkg.mk
include ${INCLUDE_MAKEFILES}/pub.mk
#include ${INCLUDE_MAKEFILES}/miun.port.mk
10 changes: 5 additions & 5 deletions makefiles.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ \chapter{results.mk}
\input{results.tex}


%\appendix
%\part{Appendices}
%
%\chapter{MIUN-specific includes}
%\input{miun.port.tex}
\appendix
\part{Appendices}

\chapter{MIUN-compatibility layer}
\input{miun.compat.tex}


\printbibliography[heading=bibintoc]{}
Expand Down
Loading