Merge branch 'master' of qo.physics.wm.edu:makefile_templates

3 files changed, 43 insertions, 9 deletions

diff --git a/raw.mk b/raw.mk
index d3688c3..171ad62 100644
--- a/raw.mk
+++ b/raw.mk
@@ -17,7 +17,7 @@ install_raw: $(raw_dest_targets)
 
 $(raw_dest_targets): $(dest_dir_raw)/% : % | $(dest_dir_raw)
 ifneq ($(strip $(raw_files)),)
-	$(INSTALL) -m 0644 '$<' '$@'
+	$(INSTALL) -D -m 0644 '$<' '$@'
 endif
 
 
diff --git a/subdir_makefile/Makefile2ndLayer b/subdir_makefile/Makefile2ndLayer
new file mode 100644
index 0000000..6e6b59f
--- /dev/null
+++ b/subdir_makefile/Makefile2ndLayer
@@ -0,0 +1,32 @@
+# -*- make -*-
+
+# Default value so one can compile this standalone
+TOPDIR ?= ../..
+include ./local.mk
+include $(TOPDIR)/common.mk
+dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR)
+
+include $(MAKEINCLUDE_DIR)/t2t.mk
+include $(MAKEINCLUDE_DIR)/pandoc.mk
+include $(MAKEINCLUDE_DIR)/rem.mk
+include $(MAKEINCLUDE_DIR)/beamer_lecture.mk
+include $(MAKEINCLUDE_DIR)/tex.mk
+include $(MAKEINCLUDE_DIR)/css.mk
+include $(MAKEINCLUDE_DIR)/raw.mk
+include $(MAKEINCLUDE_DIR)/subdirs.mk
+include $(MAKEINCLUDE_DIR)/dest_dirs.mk
+
+
+.DEFAULT_GOAL := all
+.PHONY: all compile clean real_clean install subdirs
+
+all: compile install
+
+compile: subdirs $(REQUIRED_TARGETS)
+
+clean: subdirs $(CLEAN_TARGETS)
+	
+real_clean: subdirs clean $(REAL_CLEAN_TARGETS)
+
+install: subdirs $(INSTALL_TARGETS)
+
diff --git a/video.mk b/video.mk
index 67fe5f2..0c01b33 100644
--- a/video.mk
+++ b/video.mk
@@ -11,19 +11,21 @@ ffmpegOptions ?= -movflags faststart -r 15 -c:v libx264 -preset veryfast -tune s
 # recode video with no filters
 # ffmpegOptions ?= -movflags faststart -c:v libx264 -preset veryfast -tune stillimage -c:a libfdk_aac -vbr 1
 
-rawDir = rawVideo
-recodedDir = recodedVideo
-readyDir = readyVideo
+rawDir ?= rawVideo
+recodedDir ?= recodedVideo
+readyDir ?= readyVideo
+video_ext_in ?= mp4
+video_ext_out ?= mp4
 
 dest_dir_video_recoded ?= $(dest_dir)/$(recodedDir)
 dest_dir_video_ready ?= $(dest_dir)/$(readyDir)
 destination_dirs += $(dest_dir_video_recoded) $(dest_dir_video_ready)
 
-rawVideo = $(wildcard $(rawDir)/*.mp4)
-recoded_video_from_raw = $(rawVideo:$(rawDir)/%=$(recodedDir)/%)
-recoded_video_dest_targets = $(rawVideo:$(rawDir)/%=$(dest_dir_video_recoded)/%)
+rawVideo = $(wildcard $(rawDir)/*.$(video_ext_in))
+recoded_video_from_raw = $(rawVideo:$(rawDir)/%.$(video_ext_in)=$(recodedDir)/%.$(video_ext_out))
+recoded_video_dest_targets = $(rawVideo:$(rawDir)/%.$(video_ext_in)=$(dest_dir_video_recoded)/%.$(video_ext_out))
 
-readyVideo = $(wildcard $(readyDir)/*.mp4)
+readyVideo = $(wildcard $(readyDir)/*.$(video_ext_out))
 ready_video_dest_targets = $(readyVideo:$(readyDir)/%=$(dest_dir_video_ready)/%)
 
 
@@ -38,7 +40,7 @@ $(dest_dir_video_recoded):
 $(recodedDir):
 	$(INSTALL) -d -m 0755 '$@'
 
-$(recodedDir)/% : $(rawDir)/% | $(recodedDir)
+$(recodedDir)/%.$(video_ext_out) : $(rawDir)/%.$(video_ext_in) | $(recodedDir)
 	ffmpeg -i $< $(ffmpegOptions) $@
 
 install_recoded_video: $(recoded_video_dest_targets)