From 2d985830cba693733a734d266f4ab0ce3f18ae00 Mon Sep 17 00:00:00 2001 From: Eugeniy Mikhailov Date: Wed, 11 Sep 2013 13:17:27 -0400 Subject: make includes improved --- make_templates/t2t.mk | 11 +++++++++-- make_templates/tex.mk | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/make_templates/t2t.mk b/make_templates/t2t.mk index 64d1535..80cf65d 100644 --- a/make_templates/t2t.mk +++ b/make_templates/t2t.mk @@ -30,14 +30,21 @@ $(pdf_from_t2t): %.pdf : %.tex $(t2t_fig_files) dest_dir_t2t: $(INSTALL) -d -m 0755 $(dest_dir) -install_html_t2t: dest_dir_t2t $(html_from_t2t) -ifneq ($(strip $(html_from_t2t)),) +install_t2t_src: dest_dir_t2t install_t2t_fig_files +ifneq ($(strip $(t2t_files)),) $(INSTALL) -m 0644 $(html_from_t2t) $(dest_dir)/ endif + +install_t2t_fig_files: ifneq ($(strip $(t2t_fig_files)),) $(INSTALL) -m 0644 $(t2t_fig_files) $(dest_dir)/ endif +install_html_t2t: dest_dir_t2t $(html_from_t2t) install_t2t_fig_files +ifneq ($(strip $(html_from_t2t)),) + $(INSTALL) -m 0644 $(html_from_t2t) $(dest_dir)/ +endif + install_pdf_t2t: dest_dir_t2t $(pdf_from_t2t) ifneq ($(strip $(pdf_from_t2t)),) $(INSTALL) -m 0644 $(pdf_from_t2t) $(dest_dir)/ diff --git a/make_templates/tex.mk b/make_templates/tex.mk index 01c32b1..61ffce4 100644 --- a/make_templates/tex.mk +++ b/make_templates/tex.mk @@ -8,7 +8,7 @@ pdf_from_independent_tex= $(tex_independent:%.tex=%.pdf) pdf_tex: $(pdf_from_independent_tex) -$(pdf_from_independent_tex): %.pdf : %.tex $(tex_fig_files) +$(pdf_from_independent_tex): %.pdf : %.tex $(tex_fig_files) $(tex_includes) rubber -d $< dest_dir_tex: @@ -18,6 +18,11 @@ install_pdf_tex: dest_dir_tex $(pdf_from_independent_tex) ifneq ($(strip $(pdf_from_independent_tex)),) $(INSTALL) -m 0644 $(pdf_from_independent_tex) $(dest_dir)/ endif + +install_tex_src: dest_dir_tex +ifneq ($(strip $(tex_independent)),) + $(INSTALL) -m 0644 $(tex_independent) $(dest_dir)/ +endif ifneq ($(strip $(tex_fig_files)),) $(INSTALL) -m 0644 $(tex_fig_files) $(dest_dir)/ endif -- cgit v1.2.3