janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 13:17:39 +01:00
Code Activity

lib|rules.mk: Move Windows resource file creation into rules.mk

Browse source 
Move rule for creation of windows resource files into rules.mk,
because it's needed outside of the lib subdir.
This commit is contained in:
Jan Lindemann 2009-08-09 15:32:01 +00:00 • committed by Jan Lindemann
commit 3a9e97e677
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/lib.mk
View file

@ -72,18 +72,6 @@ echo.contrib-libs:
@echo CONTRIB_LIBS = $(CONTRIB_LIBS) @echo CONTRIB_LIBS = $(CONTRIB_LIBS)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
$(WINRES_RC): $(WINRES_RC_TMPL)
cat $< | sed " \
s/__VER_FILEVERSION__/$(MAJOR_VERSION),$(MINOR_VERSION),$(RELEASE_VERSION),$(BUILD_NUMBER)/; \
s/__VER_FILEVERSION_STR__/$(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION).$(BUILD_NUMBER)/; \
s/__VER_DESCRIPTION__/\"$(PROJECT_DESCR)\"/; \
s/__VER_COMPANY_NAME__/\"$(CUSTOMER)\"/; \
" > $@.tmp
mv $@.tmp $@
$(WINRES_O): $(WINRES_RC)
$(WINDRES) $^ -o $@
clean.winres: clean.winres:
rm -f $(WINRES_RC) $(WINRES_O) *.tmp rm -f $(WINRES_RC) $(WINRES_O) *.tmp

12
make/rules.mk
View file

@ -213,6 +213,18 @@ $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
$(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \ $(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
else else
$(WINRES_RC): $(WINRES_RC_TMPL)
cat $< | sed " \
s/__VER_FILEVERSION__/$(MAJOR_VERSION),$(MINOR_VERSION),$(RELEASE_VERSION),$(BUILD_NUMBER)/; \
s/__VER_FILEVERSION_STR__/$(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION).$(BUILD_NUMBER)/; \
s/__VER_DESCRIPTION__/\"$(PROJECT_DESCR)\"/; \
s/__VER_COMPANY_NAME__/\"$(CUSTOMER)\"/; \
" > $@.tmp
mv $@.tmp $@
$(WINRES_O): $(WINRES_RC)
$(WINDRES) $^ -o $@
$(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done $(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
$(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \ $(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \
sed 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \ sed 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \