comparison make/Makefile @ 3966:5d871c1ff17c

Merge
author iveresov
date Fri, 30 Sep 2011 13:48:17 -0700
parents da0999c4b733 f08d439fab8c
children 436b4a3231bf
comparison
equal deleted inserted replaced
3956:3607aac85aa9 3966:5d871c1ff17c
321 321
322 # Shared Library 322 # Shared Library
323 ifneq ($(OSNAME),windows) 323 ifneq ($(OSNAME),windows)
324 ifeq ($(ZERO_BUILD), true) 324 ifeq ($(ZERO_BUILD), true)
325 ifeq ($(SHARK_BUILD), true) 325 ifeq ($(SHARK_BUILD), true)
326 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so 326 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
327 $(install-file) 327 $(install-file)
328 $(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so 328 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
329 $(install-file) 329 $(install-file)
330 else 330 else
331 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so 331 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
332 $(install-file) 332 $(install-file)
333 $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so 333 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
334 $(install-file) 334 $(install-file)
335 endif 335 endif
336 else 336 else
337 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so 337 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
338 $(install-file) 338 $(install-file)
339 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so 339 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
340 $(install-file) 340 $(install-file)
341 $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so 341 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
342 $(install-file) 342 $(install-file)
343 $(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so 343 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
344 $(install-file) 344 $(install-file)
345 $(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so 345 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
346 $(install-file) 346 $(install-file)
347 $(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so 347 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
348 $(install-file) 348 $(install-file)
349 349
350 # Debug info for shared library 350 # Debug info for shared library
351 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 351 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
352 $(install-file) 352 $(install-file)