/[jscoverage]/trunk/js/config/rules.mk
ViewVC logotype

Diff of /trunk/js/config/rules.mk

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 507 by siliconforks, Sun Jan 10 07:23:34 2010 UTC revision 585 by siliconforks, Sun Sep 12 15:13:23 2010 UTC
# Line 973  Line 973 
973  # creates OBJS, links with LIBS to create Foo  # creates OBJS, links with LIBS to create Foo
974  #  #
975  $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)  $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
976            @rm -f $@.manifest
977  ifeq (WINCE,$(OS_ARCH))  ifeq (WINCE,$(OS_ARCH))
978          $(LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)          $(LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
979  else  else
# Line 981  Line 982 
982  ifdef MSMANIFEST_TOOL  ifdef MSMANIFEST_TOOL
983          @if test -f $@.manifest; then \          @if test -f $@.manifest; then \
984                  if test -f "$(srcdir)/$@.manifest"; then \                  if test -f "$(srcdir)/$@.manifest"; then \
985                            echo "Embedding manifest from $(srcdir)/$@.manifest and $@.manifest"; \
986                          mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \                          mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \
987                  else \                  else \
988                            echo "Embedding manifest from $@.manifest"; \
989                          mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \                          mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
990                  fi; \                  fi; \
991                  rm -f $@.manifest; \          elif test -f "$(srcdir)/$@.manifest"; then \
992                    echo "Embedding manifest from $(srcdir)/$@.manifest"; \
993                    mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" -OUTPUTRESOURCE:$@\;1; \
994          fi          fi
995  endif   # MSVC with manifest tool  endif   # MSVC with manifest tool
996  else  else
# Line 1864  Line 1869 
1869  $(FINAL_TARGET)/chrome:  $(FINAL_TARGET)/chrome:
1870          $(NSINSTALL) -D $@          $(NSINSTALL) -D $@
1871    
1872    libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
1873  ifneq (,$(wildcard $(JAR_MANIFEST)))  ifneq (,$(wildcard $(JAR_MANIFEST)))
1874  ifndef NO_DIST_INSTALL  ifndef NO_DIST_INSTALL
 libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome  
1875          $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \          $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
1876            $(QUIET) -j $(FINAL_TARGET)/chrome \            $(QUIET) -j $(FINAL_TARGET)/chrome \
1877            $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \            $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \

Legend:
Removed from v.507  
changed lines
  Added in v.585

  ViewVC Help
Powered by ViewVC 1.1.24