diff --git a/make-includes/build_content_rules.make b/make-includes/build_content_rules.make index 279e2bf..5925282 100755 --- a/make-includes/build_content_rules.make +++ b/make-includes/build_content_rules.make @@ -45,15 +45,18 @@ ################################################################################ # -# Paths. All original graphics should normally be in ./graphics/source, -# and derived versions should normally be placed in ./graphics. If you -# want something different, write your own rules, you deviant! +# Paths. All original graphics should normally be in ./graphics (where . +# represents the current content directory), and derived versions should +# normally be placed in $(BUILD_DIR). If you want something different, +# write your own rules, you deviant! # vpath %-web.png $(BUILD_DIR) vpath %-web-zoom.png $(BUILD_DIR) # vpath %-web-hires.png $(BUILD_DIR) vpath %-print.pdf $(BUILD_DIR) vpath %.eps graphics +vpath %-print.png $(BUILD_DIR) +vpath %.png graphics ################################################################################ @@ -129,6 +132,25 @@ ################################################################################ # +# Some graphics start out as bitmaps (e.g., screenshots) and will +# therefore not have an EPS version. We assume that the source for such +# images is a PNG file instead. We don't need to generate anything; rather +# we just copy the original file to the build directory, because we're +# using PNG for the web version anyway, and PDFLaTeX supports PNG +# natively. +# +%-print.png: %.png + @announce "Generating $@ (print)" + @cp $< $(BUILD_DIR)/$@ + +%-web.png: %.png + @announce "Generating $@ (web)" + @cp $< $(BUILD_DIR)/$@ + + + +################################################################################ +# # Clean up. These targets are probably no longer needed, as the build # versions are now generated in the build directory. There should # consequently be no extraneous files floating around in the content