Changes in Makefile [910bd98:71eba5e] in git
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r910bd98 r71eba5e 2419 2419 @mkdir -p $(@D) 2420 2420 @echo ">> Building $@" 2421 ifeq ($(ARCH),aix5) 2422 @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^ 2423 else 2421 2424 ifeq ($(PLATFORM),macosx) 2425 # We need to make both the .dylib and the .so 2422 2426 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2427 ifneq ($(subst $(MACOSX_MINOR),,1234),1234) 2428 ifeq ($(MACOSX_MINOR),4) 2429 @ln -sf $@ $(subst .$(DllSuf),.so,$@) 2430 endif 2431 endif 2423 2432 else 2424 2433 ifeq ($(PLATFORM),win32) … … 2429 2438 else 2430 2439 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2440 @$(MT_DLL) 2441 endif 2431 2442 endif 2432 2443 endif … … 2435 2446 @mkdir -p $(@D) 2436 2447 @echo ">> Building $@" 2448 ifeq ($(ARCH),aix5) 2449 @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^ 2450 else 2437 2451 ifeq ($(PLATFORM),macosx) 2452 # We need to make both the .dylib and the .so 2438 2453 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2454 ifneq ($(subst $(MACOSX_MINOR),,1234),1234) 2455 ifeq ($(MACOSX_MINOR),4) 2456 @ln -sf $@ $(subst .$(DllSuf),.so,$@) 2457 endif 2458 endif 2439 2459 else 2440 2460 ifeq ($(PLATFORM),win32) … … 2445 2465 else 2446 2466 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2467 @$(MT_DLL) 2468 endif 2447 2469 endif 2448 2470 endif … … 2451 2473 @mkdir -p $(@D) 2452 2474 @echo ">> Building $@" 2475 ifeq ($(ARCH),aix5) 2476 @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^ 2477 else 2453 2478 ifeq ($(PLATFORM),macosx) 2479 # We need to make both the .dylib and the .so 2454 2480 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS) 2481 ifneq ($(subst $(MACOSX_MINOR),,1234),1234) 2482 ifeq ($(MACOSX_MINOR),4) 2483 @ln -sf $@ $(subst .$(DllSuf),.so,$@) 2484 endif 2485 endif 2455 2486 else 2456 2487 ifeq ($(PLATFORM),win32) … … 2461 2492 else 2462 2493 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS) 2494 @$(MT_DLL) 2495 endif 2463 2496 endif 2464 2497 endif
Note:
See TracChangeset
for help on using the changeset viewer.