diff make/linux/makefiles/rules.make @ 356:1ee8caae33af

Merge
author tonyp
date Thu, 21 Aug 2008 23:36:31 -0400
parents 9c2ecc2ffb12
children 0fc81f0a8ca8
line wrap: on
line diff
--- a/make/linux/makefiles/rules.make	Wed Aug 06 11:57:31 2008 -0400
+++ b/make/linux/makefiles/rules.make	Thu Aug 21 23:36:31 2008 -0400
@@ -1,5 +1,5 @@
 #
-# Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,10 @@
 COMPILE_DONE    = && { echo Done with $<; }
 endif
 
-include $(GAMMADIR)/make/defs.make
+# Include $(NONPIC_OBJ_FILES) definition
+ifndef LP64
+include $(GAMMADIR)/make/pic.make
+endif
 
 # The non-PIC object files are only generated for 32 bit platforms.
 ifdef LP64