comparison make/common/Library.gmk @ 3433:f08682e23279

Merge
author ohair
date Wed, 02 Feb 2011 09:39:31 -0800
parents fe1b5c15afab 006c683ead1a
children 6aeed99af874
comparison
equal deleted inserted replaced
9:5d4fb9d9598f 11:d8f94ade99c8
165 $(LINK) -dll -out:$(OBJDIR)/$(@F) \ 165 $(LINK) -dll -out:$(OBJDIR)/$(@F) \
166 -map:$(OBJDIR)/$(LIBRARY).map \ 166 -map:$(OBJDIR)/$(LIBRARY).map \
167 $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \ 167 $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
168 $(OTHER_LCF) $(JAVALIB) $(LDLIBS) 168 $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
169 $(CP) $(OBJDIR)/$(@F) $@ 169 $(CP) $(OBJDIR)/$(@F) $@
170 @$(call binary_file_verification,$@)
170 $(install-module-file) 171 $(install-module-file)
171 $(CP) $(OBJDIR)/$(LIBRARY).map $(@D) 172 $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
172 $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D) 173 $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
173 174
174 $(ACTUAL_LIBRARY):: $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).map $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).pdb 175 $(ACTUAL_LIBRARY):: $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).map $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).pdb
231 @$(ECHO) "Rebuilding $@ because of $?" 232 @$(ECHO) "Rebuilding $@ because of $?"
232 ifeq ($(LIBRARY), fdlibm) 233 ifeq ($(LIBRARY), fdlibm)
233 $(AR) -r $@ $(FILES_o) 234 $(AR) -r $@ $(FILES_o)
234 else # LIBRARY 235 else # LIBRARY
235 $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) 236 $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
237 @$(call binary_file_verification,$@)
236 $(install-module-file) 238 $(install-module-file)
237 ifeq ($(WRITE_LIBVERSION),true) 239 ifeq ($(WRITE_LIBVERSION),true)
238 $(MCS) -d -a "$(FULL_VERSION)" $@ 240 $(MCS) -d -a "$(FULL_VERSION)" $@
239 endif # WRITE_LIBVERSION 241 endif # WRITE_LIBVERSION
240 endif # LIBRARY 242 endif # LIBRARY