Commit 77f23df7 authored by Finnish Language Team's avatar Finnish Language Team

fixed target for images, not anymore each of $(IMGDESTFILES) depends on every...

fixed target for images, not anymore each of $(IMGDESTFILES) depends on every of $(IMGFILES), just the one it is copied from; also removed $(*DESTFILES) and use only $(IMGDESTFILES) as others arent needed

CVS version numbers

Makefile.common: 1.35 -> 1.36
parent e63d2951
...@@ -28,26 +28,18 @@ HTMLFILES = $(sort $(foreach i,$(SUBLANG),\ ...@@ -28,26 +28,18 @@ HTMLFILES = $(sort $(foreach i,$(SUBLANG),\
HTMLDESTFILES = $(sort $(foreach i,$(SUBLANG),\ HTMLDESTFILES = $(sort $(foreach i,$(SUBLANG),\
$(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE)-$(i).html,$(WMLFILES)))) $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE)-$(i).html,$(WMLFILES))))
endif endif
JPGSOURCE := $(wildcard *.jpg) JPGSOURCE := $(wildcard *.jpg)
JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
GIFSOURCE := $(wildcard *.gif) GIFSOURCE := $(wildcard *.gif)
GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
PNGSOURCE := $(wildcard *.png) PNGSOURCE := $(wildcard *.png)
PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
PSSOURCE := $(wildcard *.ps.gz) PSSOURCE := $(wildcard *.ps.gz)
PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
EPSSOURCE := $(wildcard *.eps) EPSSOURCE := $(wildcard *.eps)
EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
PDFSOURCE := $(wildcard *.pdf) PDFSOURCE := $(wildcard *.pdf)
PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
FIGSOURCE := $(wildcard *.fig) FIGSOURCE := $(wildcard *.fig)
FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
XCFSOURCE := $(wildcard *.xcf.gz) XCFSOURCE := $(wildcard *.xcf.gz)
XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
CSSSOURCE := $(wildcard *.css) CSSSOURCE := $(wildcard *.css)
CSSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(CSSSOURCE))
IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE) $(CSSSOURCE) IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE) $(CSSSOURCE)
IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES) $(CSSDESTFILES) IMGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(IMGFILES))
existing-SUBS := $(shell for dir in $(wildcard $(SUBS)) ''; do test -d $$dir && echo $$dir; done) existing-SUBS := $(shell for dir in $(wildcard $(SUBS)) ''; do test -d $$dir && echo $$dir; done)
existing-SUBS-install := $(addsuffix -install,$(existing-SUBS)) existing-SUBS-install := $(addsuffix -install,$(existing-SUBS))
...@@ -116,10 +108,10 @@ ifeq ($(LANGUAGE),en) ...@@ -116,10 +108,10 @@ ifeq ($(LANGUAGE),en)
endif endif
endif endif
$(IMGDESTFILES): $(IMGFILES) $(IMGDESTFILES): $(HTMLDIR)/%: %
install -m 664 -p $(@F) $(HTMLDIR) install -m 664 -p $< $(HTMLDIR)
ifeq "$(LANGUAGE)" "en" ifeq "$(LANGUAGE)" "en"
[ -f "$(HTMLDIR)/$(basename $(basename $(@F)))$(suffix $(@F))" ] || ln -s $(@F) $(HTMLDIR)/$(basename $(basename $(@F)))$(suffix $(@F)) [ -f "$(HTMLDIR)/$(basename $(basename $<))$(suffix $<)" ] || ln -s $< $(HTMLDIR)/$(basename $(basename $<))$(suffix $<)
endif endif
# template dependencies # template dependencies
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment