modified config to simplify makes

2 files changed, 54 insertions, 48 deletions

diff --git a/matlab_usage_source/Makefile b/matlab_usage_source/Makefile
index 3c1a5f0..ce472e5 100644
--- a/matlab_usage_source/Makefile
+++ b/matlab_usage_source/Makefile
@@ -1,64 +1,58 @@
 # -*- make -*-
 # FILE: "/home/evmik/jobs/wm/2013_fall_Experimental_Atomic_Physics_251/matlab_usage_source/Makefile"
-# LAST MODIFICATION: "Tue, 10 Sep 2013 11:34:28 -0400 (evmik)"
+# LAST MODIFICATION: "Wed, 11 Sep 2013 11:09:18 -0400 (evmik)"
 # (C) 2001 by Eugeniy Mikhailov, <evmik@tamu.edu>
 # $Id: Makefile,v 1.3 2003/04/23 20:40:19 evmik Exp $
 
-MANUSCRIPT_DIR = $(shell basename `pwd`)
-SUBDIR=`find ./ -maxdepth 1 -type d |sed 1d| sed /CVS/d`
-
-INSTALL = install -C
-CP_FILES = $(INSTALL) --mode=664
-
-dest_dir = ../matlab_usage
-
-LATEX_OPTIONS="-interaction=nonstopmode -src-specials"
-
-DATE := $(shell date +%Y%m%d)
-
-ROOT_OF_MAIN_TEX_FILE= EIT_filter
-MAIN_TEX_FILE=$(ROOT_OF_MAIN_TEX_FILE).tex
+# Default value so one can compile i3-msg standalone
+TOPDIR=..
+include $(TOPDIR)/common.mk
+include ./local.mk
 
 t2t_files  = $(wildcard *.t2t)
-tex_targets  = $(t2t_files:%.t2t=%.tex)
-pdf_targets  = $(tex_targets:%.tex=%.pdf)	
-html_targets = $(t2t_files:%.t2t=%.html)
+tex_from_t2t  = $(t2t_files:%.t2t=%.tex)
+pdf_from_t2t  = $(tex_from_t2t:%.tex=%.pdf)	
+html_from_t2t = $(t2t_files:%.t2t=%.html)
 
-tex_independent= 
-pdf_independent= $(tex_independent:%.tex=%.pdf)
+pdf_from_independent_tex= $(tex_independent:%.tex=%.pdf)
 
-fig_files = errorbar_plot.png errorbar_with_large_font_plot.png fitted_data_improved.png fitted_data.png simple_labeled_and_proper_limits_plot.png simple_labeled_plot.png simple_unlabeled_plot.png
+dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR)
+misc_files = $(t2t_fig_files) $(tex_independent)
 
-misc_files = $(fig_files) $(tex_independent)
 
-all: html $(pdf_independent) copy2dest
+all: $(REQUIRED_TARGETS) $(INSTALLED_TARGETS)
 	make clean
 
-html: $(html_targets)
+html_t2t: $(html_from_t2t)
+
+pdf_tex:  $(pdf_from_independent_tex)
 
-pdf:  $(pdf_independent)
+pdf_t2t:  $(pdf_from_t2t)
 
-tex: $(tex_targets)
+tex: $(tex_from_t2t)
 
 
 
-$(html_targets): %.html : %.t2t
+$(html_from_t2t): %.html : %.t2t $(t2t_fig_files)
 	txt2tags --css-sugar -t html -o $@ $< 
 	
 
-$(pdf_targets): %.pdf : %.tex
+$(pdf_from_t2t): %.pdf : %.tex $(t2t_fig_files)
 	rubber -d  $< 
 
-$(pdf_independent): %.pdf : %.tex
+$(pdf_from_independent_tex): %.pdf : %.tex $(tex_fig_files)
 	rubber -d  $< 
 
 $(dest_dir):
-	$(INSTALL) -d $(dest_dir)
+	$(INSTALL) -d -m 0755 $(dest_dir)
+
+install_html_t2t: $(dest_dir) $(html_from_t2t)
+	$(INSTALL) -m 0644 $(html_from_t2t) $(dest_dir)/
+	$(INSTALL) -m 0644 $(t2t_fig_files) $(dest_dir)/
 
-copy2dest: $(dest_dir) pdf
-	$(CP_FILES)  $(html_targets) $(dest_dir)/
-	#$(CP_FILES)  $(pdf_independent) $(dest_dir)/
-	$(CP_FILES)  $(misc_files) $(dest_dir)/
+install_pdf_tex: $(dest_dir) $(pdf_from_independent_tex)
+	$(INSTALL) -m 0644 $(pdf_from_independent_tex) $(dest_dir)/
+	$(INSTALL) -m 0644 $(tex_fig_files) $(dest_dir)/
 
 clean: clean_tex
 	rm -f last_time_uploaded
@@ -66,25 +60,24 @@ clean: clean_tex
 real_clean: clean_all
 	
 clean_all: clean	
-	rm -f $(pdf_targets)
-	rm -f $(pdf_independent)
-	rm -f $(html_targets)
+	rm -f $(pdf_from_t2t)
+	rm -f $(pdf_from_independent_tex)
+	rm -f $(html_from_t2t)
 
 clean_tex:
-	rm -f $(tex_targets:%.tex=%.dvi)
-	rm -f $(tex_targets:%.tex=%.log)
-	rm -f $(tex_targets:%.tex=%.aux)
-	rm -f $(tex_targets:%.tex=%.nav)
-	rm -f $(tex_targets:%.tex=%.out)
-	rm -f $(tex_targets:%.tex=%.snm)
-	rm -f $(tex_targets:%.tex=%.toc)
-	rm -f $(tex_targets:%.tex=%.vrb)
-	rm -f $(tex_targets:%.tex=%.blg)
-	rm -f $(GENERATED_AUX_FILES)
+	rm -f $(tex_from_t2t:%.tex=%.dvi)
+	rm -f $(tex_from_t2t:%.tex=%.log)
+	rm -f $(tex_from_t2t:%.tex=%.aux)
+	rm -f $(tex_from_t2t:%.tex=%.nav)
+	rm -f $(tex_from_t2t:%.tex=%.out)
+	rm -f $(tex_from_t2t:%.tex=%.snm)
+	rm -f $(tex_from_t2t:%.tex=%.toc)
+	rm -f $(tex_from_t2t:%.tex=%.vrb)
+	rm -f $(tex_from_t2t:%.tex=%.blg)
 	rm -f missfont.log
 	rm -f *Notes.bib
 
 clean_bib:
-	rm -f $(tex_targets:%.tex=%.bbl)
+	rm -f $(tex_from_t2t:%.tex=%.bbl)
 
 
diff --git a/matlab_usage_source/local.mk b/matlab_usage_source/local.mk
new file mode 100644
index 0000000..2091734
--- /dev/null
+++ b/matlab_usage_source/local.mk
@@ -0,0 +1,13 @@
+# -*- make -*-
+# (C) 2013 by Eugeniy Mikhailov, <evgmik@gmail.com>
+
+
+PACKAGE_DIR = $(shell basename `pwd`)
+
+tex_independent := 
+t2t_fig_files := errorbar_plot.png errorbar_with_large_font_plot.png fitted_data_improved.png fitted_data.png simple_labeled_and_proper_limits_plot.png simple_labeled_plot.png simple_unlabeled_plot.png
+
+#REQUIRED_TARGETS = html_t2t pdf_tex
+REQUIRED_TARGETS = html_t2t
+#INSTALLED_TARGETS = install_html_t2t install_pdf_tex
+INSTALLED_TARGETS = install_html_t2t