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

Merge
author tonyp
date Thu, 21 Aug 2008 23:36:31 -0400
parents 9c2ecc2ffb12
children 0fc81f0a8ca8
comparison
equal deleted inserted replaced
355:0edda524b58c 356:1ee8caae33af
1 # 1 #
2 # Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. 2 # Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
131 # With parallel makes, print a message at the end of compilation. 131 # With parallel makes, print a message at the end of compilation.
132 ifeq ($(findstring j,$(MFLAGS)),j) 132 ifeq ($(findstring j,$(MFLAGS)),j)
133 COMPILE_DONE = && { echo Done with $<; } 133 COMPILE_DONE = && { echo Done with $<; }
134 endif 134 endif
135 135
136 include $(GAMMADIR)/make/defs.make 136 # Include $(NONPIC_OBJ_FILES) definition
137 ifndef LP64
138 include $(GAMMADIR)/make/pic.make
139 endif
137 140
138 # The non-PIC object files are only generated for 32 bit platforms. 141 # The non-PIC object files are only generated for 32 bit platforms.
139 ifdef LP64 142 ifdef LP64
140 %.o: %.cpp 143 %.o: %.cpp
141 @echo Compiling $< 144 @echo Compiling $<