[Stlport-cvs] STLport/build/Makefiles/nmake/lib clean.mak,STLPORT_5_0,1.1.2.2,1.1.2.3 macro.mak,STLP
Brought to you by:
complement
Menu
▾
▴
[Stlport-cvs] STLport/build/Makefiles/nmake/lib clean.mak,STLPORT_5_0,1.1.2.2,1.1.2.3 macro.mak,STLPORT_5_0,1.1.2.2,1.1.2.3 rules-install-so.mak,STLPORT_5_0,1.1.2.2,1.1.2.3
|
From: Francois D. <du...@us...> - 2005-08-31 10:23:39
|
Update of /cvsroot/stlport/STLport/build/Makefiles/nmake/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32010/build/Makefiles/nmake/lib Modified Files: Tag: STLPORT_5_0 clean.mak macro.mak rules-install-so.mak Log Message: no message Index: rules-install-so.mak =================================================================== RCS file: /cvsroot/stlport/STLport/build/Makefiles/nmake/lib/rules-install-so.mak,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- rules-install-so.mak 16 Apr 2005 14:39:41 -0000 1.1.2.2 +++ rules-install-so.mak 31 Aug 2005 10:23:24 -0000 1.1.2.3 @@ -14,15 +14,24 @@ $(INSTALL_SO) $(PDB_NAME_OUT) $(INSTALL_BIN_DIR) $(INSTALL_SO) $(LIB_NAME_OUT) $(INSTALL_LIB_DIR) $(INSTALL_SO) $(EXP_NAME_OUT) $(INSTALL_LIB_DIR) +!if "$(COMPILER_NAME)" == "vc8" + $(INSTALL_SO) $(MANIFEST_NAME_OUT) $(INSTALL_BIN_DIR) +!endif install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR_DBG) $(INSTALL_LIB_DIR_DBG) $(INSTALL_SO) $(SO_NAME_OUT_DBG) $(INSTALL_BIN_DIR_DBG) $(INSTALL_SO) $(PDB_NAME_OUT_DBG) $(INSTALL_BIN_DIR_DBG) $(INSTALL_SO) $(LIB_NAME_OUT_DBG) $(INSTALL_LIB_DIR_DBG) $(INSTALL_SO) $(EXP_NAME_OUT_DBG) $(INSTALL_LIB_DIR_DBG) +!if "$(COMPILER_NAME)" == "vc8" + $(INSTALL_SO) $(MANIFEST_NAME_OUT_DBG) $(INSTALL_BIN_DIR) +!endif install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_SO) $(SO_NAME_OUT_STLDBG) $(INSTALL_BIN_DIR_STLDBG) $(INSTALL_SO) $(PDB_NAME_OUT_STLDBG) $(INSTALL_BIN_DIR_STLDBG) $(INSTALL_SO) $(LIB_NAME_OUT_STLDBG) $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_SO) $(EXP_NAME_OUT_STLDBG) $(INSTALL_LIB_DIR_STLDBG) +!if "$(COMPILER_NAME)" == "vc8" + $(INSTALL_SO) $(MANIFEST_NAME_OUT_STLDBG) $(INSTALL_BIN_DIR) +!endif Index: macro.mak =================================================================== RCS file: /cvsroot/stlport/STLport/build/Makefiles/nmake/lib/macro.mak,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- macro.mak 16 Apr 2005 14:39:41 -0000 1.1.2.2 +++ macro.mak 31 Aug 2005 10:23:24 -0000 1.1.2.3 @@ -18,36 +18,42 @@ EXP_NAME = $(SO_NAME_BASE).$(EXP) PDB_NAME = $(SO_NAME_BASE).pdb RES_NAME = $(LIBNAME).res +MANIFEST_NAME = $(SO_NAME).manifest SO_NAME_OUT = $(OUTPUT_DIR)\$(SO_NAME) LIB_NAME_OUT = $(OUTPUT_DIR)\$(LIB_NAME) EXP_NAME_OUT = $(OUTPUT_DIR)\$(EXP_NAME) PDB_NAME_OUT = $(OUTPUT_DIR)\$(PDB_NAME) RES_NAME_OUT = $(OUTPUT_DIR)\$(RES_NAME) +MANIFEST_NAME_OUT = $(OUTPUT_DIR)\$(MANIFEST_NAME) SO_NAME_DBG_BASE = $(LIB_NAME_PREFIX)$(LIBNAME)_$(DBG_SUFFIX)$(MAJOR)$(MINOR) SO_NAME_DBG = $(SO_NAME_DBG_BASE).$(SO) LIB_NAME_DBG = $(SO_NAME_DBG_BASE).$(LIBEXT) EXP_NAME_DBG = $(SO_NAME_DBG_BASE).$(EXP) PDB_NAME_DBG = $(SO_NAME_DBG_BASE).pdb +MANIFEST_NAME_DBG = $(SO_NAME_DBG).manifest SO_NAME_OUT_DBG = $(OUTPUT_DIR_DBG)\$(SO_NAME_DBG) LIB_NAME_OUT_DBG = $(OUTPUT_DIR_DBG)\$(LIB_NAME_DBG) EXP_NAME_OUT_DBG = $(OUTPUT_DIR_DBG)\$(EXP_NAME_DBG) PDB_NAME_OUT_DBG = $(OUTPUT_DIR_DBG)\$(PDB_NAME_DBG) RES_NAME_OUT_DBG = $(OUTPUT_DIR_DBG)\$(RES_NAME) +MANIFEST_NAME_OUT_DBG = $(OUTPUT_DIR_DBG)\$(MANIFEST_NAME_DBG) SO_NAME_STLDBG_BASE = $(LIB_NAME_PREFIX)$(LIBNAME)_$(STLDBG_SUFFIX)$(MAJOR)$(MINOR) SO_NAME_STLDBG = $(SO_NAME_STLDBG_BASE).$(SO) LIB_NAME_STLDBG = $(SO_NAME_STLDBG_BASE).$(LIBEXT) EXP_NAME_STLDBG = $(SO_NAME_STLDBG_BASE).$(EXP) PDB_NAME_STLDBG = $(SO_NAME_STLDBG_BASE).pdb +MANIFEST_NAME_STLDBG = $(SO_NAME_STLDBG).manifest SO_NAME_OUT_STLDBG = $(OUTPUT_DIR_STLDBG)\$(SO_NAME_STLDBG) LIB_NAME_OUT_STLDBG = $(OUTPUT_DIR_STLDBG)\$(LIB_NAME_STLDBG) EXP_NAME_OUT_STLDBG = $(OUTPUT_DIR_STLDBG)\$(EXP_NAME_STLDBG) PDB_NAME_OUT_STLDBG = $(OUTPUT_DIR_STLDBG)\$(PDB_NAME_STLDBG) RES_NAME_OUT_STLDBG = $(OUTPUT_DIR_STLDBG)\$(RES_NAME) +MANIFEST_NAME_OUT_STLDBG = $(OUTPUT_DIR_STLDBG)\$(MANIFEST_NAME_STLDBG) # Static libraries: A_NAME_BASE = $(LIB_NAME_PREFIX)$(LIBNAME)_static_$(RELEASE_SUFFIX)$(MAJOR)$(MINOR) Index: clean.mak =================================================================== RCS file: /cvsroot/stlport/STLport/build/Makefiles/nmake/lib/clean.mak,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- clean.mak 16 Apr 2005 14:39:41 -0000 1.1.2.2 +++ clean.mak 31 Aug 2005 10:23:24 -0000 1.1.2.3 @@ -7,6 +7,7 @@ @-del /F /Q $(EXP_NAME_OUT) @-del /F /Q $(PDB_NAME_OUT) @-del /F /Q $(RES_NAME_OUT) + @-del /F /Q $(MANIFEST_NAME_OUT) @-del /F /Q $(A_NAME_OUT) @-del /F /Q $(A_PDB_NAME_OUT) @-del /F /Q $(SO_NAME_OUT_DBG) @@ -14,6 +15,7 @@ @-del /F /Q $(EXP_NAME_OUT_DBG) @-del /F /Q $(PDB_NAME_OUT_DBG) @-del /F /Q $(RES_NAME_OUT_DBG) + @-del /F /Q $(MANIFEST_NAME_OUT_DBG) @-del /F /Q $(A_NAME_OUT_DBG) @-del /F /Q $(A_PDB_NAME_OUT_DBG) @-del /F /Q $(SO_NAME_OUT_STLDBG) @@ -21,6 +23,7 @@ @-del /F /Q $(EXP_NAME_OUT_STLDBG) @-del /F /Q $(PDB_NAME_OUT_STLDBG) @-del /F /Q $(RES_NAME_OUT_STLDBG) + @-del /F /Q $(MANIFEST_NAME_OUT_STLDBG) @-del /F /Q $(A_NAME_OUT_STLDBG) @-del /F /Q $(A_PDB_NAME_OUT_STLDBG) @-rd $(OUTPUT_DIR) |