diff --git a/mozilla/js/src/xpconnect/src/makefile.win b/mozilla/js/src/xpconnect/src/makefile.win index 9bef96ca4ad..35faf7aabb9 100644 --- a/mozilla/js/src/xpconnect/src/makefile.win +++ b/mozilla/js/src/xpconnect/src/makefile.win @@ -62,11 +62,7 @@ LLIBS= $(LIBNSPR) \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ $(DIST)\lib\xptinfo$(MOZ_BITS).lib \ $(DIST)\lib\xptcall$(MOZ_BITS).lib \ - -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif - + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/js/src/xpconnect/tests/makefile.win b/mozilla/js/src/xpconnect/tests/makefile.win index 9af70687aba..f6ac9c9f595 100644 --- a/mozilla/js/src/xpconnect/tests/makefile.win +++ b/mozilla/js/src/xpconnect/tests/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(LIBNSPR) \ $(DIST)\lib\js3250.lib \ $(DIST)\lib\xpc3250.lib \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/libxpt/tests/makefile.win b/mozilla/xpcom/libxpt/tests/makefile.win index 8d0be5d4a7a..1674e0c8f29 100644 --- a/mozilla/xpcom/libxpt/tests/makefile.win +++ b/mozilla/xpcom/libxpt/tests/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\libxpt32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/libxpt/tools/makefile.win b/mozilla/xpcom/libxpt/tools/makefile.win index 31bd412eabc..a7ed765799b 100644 --- a/mozilla/xpcom/libxpt/tools/makefile.win +++ b/mozilla/xpcom/libxpt/tools/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\libxpt32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/libxpt/xptcall/src/makefile.win b/mozilla/xpcom/libxpt/xptcall/src/makefile.win index 0fa23a1cbad..c7eeafb73f7 100644 --- a/mozilla/xpcom/libxpt/xptcall/src/makefile.win +++ b/mozilla/xpcom/libxpt/xptcall/src/makefile.win @@ -49,13 +49,9 @@ LCFLAGS = \ $(NULL) LLIBS= $(LIBNSPR) \ - $(DIST)\lib\xpcom$(MOZ_BITS).lib \ - $(DIST)\lib\xptinfo$(MOZ_BITS).lib \ - -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif - + $(DIST)\lib\xpcom$(MOZ_BITS).lib \ + $(DIST)\lib\xptinfo$(MOZ_BITS).lib \ + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/libxpt/xptcall/tests/makefile.win b/mozilla/xpcom/libxpt/xptcall/tests/makefile.win index b69bf444819..157a1236a12 100644 --- a/mozilla/xpcom/libxpt/xptcall/tests/makefile.win +++ b/mozilla/xpcom/libxpt/xptcall/tests/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(DIST)\lib\xptcall32.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win b/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win index 4733a7a0aba..943342a6423 100644 --- a/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win +++ b/mozilla/xpcom/libxpt/xptinfo/tests/makefile.win @@ -37,9 +37,7 @@ LLIBS= \ $(DIST)\lib\libxpt32.lib \ $(DIST)\lib\xptinfo32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/reflect/xptcall/src/makefile.win b/mozilla/xpcom/reflect/xptcall/src/makefile.win index 0fa23a1cbad..c7eeafb73f7 100644 --- a/mozilla/xpcom/reflect/xptcall/src/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/src/makefile.win @@ -49,13 +49,9 @@ LCFLAGS = \ $(NULL) LLIBS= $(LIBNSPR) \ - $(DIST)\lib\xpcom$(MOZ_BITS).lib \ - $(DIST)\lib\xptinfo$(MOZ_BITS).lib \ - -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif - + $(DIST)\lib\xpcom$(MOZ_BITS).lib \ + $(DIST)\lib\xptinfo$(MOZ_BITS).lib \ + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/reflect/xptcall/tests/makefile.win b/mozilla/xpcom/reflect/xptcall/tests/makefile.win index b69bf444819..157a1236a12 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/tests/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(DIST)\lib\xptcall32.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win index 4733a7a0aba..943342a6423 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win @@ -37,9 +37,7 @@ LLIBS= \ $(DIST)\lib\libxpt32.lib \ $(DIST)\lib\xptinfo32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/typelib/xpt/tests/makefile.win b/mozilla/xpcom/typelib/xpt/tests/makefile.win index 8d0be5d4a7a..1674e0c8f29 100644 --- a/mozilla/xpcom/typelib/xpt/tests/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tests/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\libxpt32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win index 31bd412eabc..a7ed765799b 100644 --- a/mozilla/xpcom/typelib/xpt/tools/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win @@ -36,9 +36,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\libxpt32.lib \ $(LIBNSPR) \ -!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib -!endif + $(NULL) include <$(DEPTH)\config\rules.mak>