Fork me on GitHub

Changes in / [5c257a5:0799cd1] in git


Ignore:
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r5c257a5 r0799cd1  
    24192419        @mkdir -p $(@D)
    24202420        @echo ">> Building $@"
     2421ifeq ($(ARCH),aix5)
     2422        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
     2423else
    24212424ifeq ($(PLATFORM),macosx)
     2425# We need to make both the .dylib and the .so
    24222426        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     2427ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     2428ifeq ($(MACOSX_MINOR),4)
     2429        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     2430endif
     2431endif
    24232432else
    24242433ifeq ($(PLATFORM),win32)
    … …  
    24292438else
    24302439        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     2440        @$(MT_DLL)
     2441endif
    24312442endif
    24322443endif
    … …  
    24352446        @mkdir -p $(@D)
    24362447        @echo ">> Building $@"
     2448ifeq ($(ARCH),aix5)
     2449        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
     2450else
    24372451ifeq ($(PLATFORM),macosx)
     2452# We need to make both the .dylib and the .so
    24382453        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     2454ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     2455ifeq ($(MACOSX_MINOR),4)
     2456        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     2457endif
     2458endif
    24392459else
    24402460ifeq ($(PLATFORM),win32)
    … …  
    24452465else
    24462466        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     2467        @$(MT_DLL)
     2468endif
    24472469endif
    24482470endif
    … …  
    24512473        @mkdir -p $(@D)
    24522474        @echo ">> Building $@"
     2475ifeq ($(ARCH),aix5)
     2476        @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^
     2477else
    24532478ifeq ($(PLATFORM),macosx)
     2479# We need to make both the .dylib and the .so
    24542480        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     2481ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     2482ifeq ($(MACOSX_MINOR),4)
     2483        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     2484endif
     2485endif
    24552486else
    24562487ifeq ($(PLATFORM),win32)
    … …  
    24612492else
    24622493        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     2494        @$(MT_DLL)
     2495endif
    24632496endif
    24642497endif

  • doc/Makefile.arch

    r5c257a5 r0799cd1  
    3939OPT2          = -g
    4040else
     41ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),)
     42OPT           = -g
     43OPT2          = -g
     44else
    4145OPT           = -O
    4246OPT2          = -O2
     47endif
    4348endif
    4449
    … …  
    4752ROOTLIBS     := $(shell $(RC) --libs)
    4853ROOTGLIBS    := $(shell $(RC) --glibs)
    49 ROOTCLING    := rootcling
     54HASTHREAD    := $(shell $(RC) --has-thread)
     55ROOTCINT     := rootcint
    5056
    5157ifeq ($(PLATFORM),macosx)
    52 ROOTLIBDIR   := $(shell $(RC) --libdir)
    53 MACOSX_MAJOR := $(strip $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1))
    54 MACOSX_MINOR := $(strip $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2))
     58MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
    5559ifeq ($(MACOSX_DEPLOYMENT_TARGET),)
    56 MACOSXTARGET := $(MACOSX_MAJOR).$(MACOSX_MINOR)
     60MACOSXTARGET := 10.$(MACOSX_MINOR)
    5761else
    5862MACOSXTARGET := $(MACOSX_DEPLOYMENT_TARGET)
    … …  
    114118SOFLAGS       = -shared
    115119DllSuf        = a
    116 EXPLLINKLIBS  = $(ROOTGLIBS)
     120EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
    117121endif
    118122
    … …  
    142146LDFLAGS       = $(OPT)
    143147SOFLAGS       = -G
     148endif
     149
     150ifeq ($(ARCH),sgicc)
     151# SGI
     152CXX           = CC -n32  -I/usr/include/CC.sgi
     153CXXFLAGS      = $(OPT)
     154LD            = CC -n32 -LANG:std  -I/usr/include/CC.sgi
     155LDFLAGS       = $(OPT)
     156SOFLAGS       = -shared
     157endif
     158
     159ifeq ($(ARCH),sgicc64)
     160# SGI
     161CXX           = CC -64  -I/usr/include/CC.sgi
     162CXXFLAGS      = $(OPT)
     163LD            = CC -64 -LANG:std -I/usr/include/CC.sgi
     164LDFLAGS       = $(OPT)
     165SOFLAGS       = -shared
     166endif
     167
     168ifeq ($(ARCH),sgigcc)
     169# SGI 6.x with gcc
     170CXX           = g++
     171CXXFLAGS      = $(OPT) -Wall -fPIC
     172LD            = g++
     173LDFLAGS       = $(OPT) -Wl,-u,__builtin_new -Wl,-u,__builtin_delete -Wl,-u,__nw__FUiPv
     174SOFLAGS       = -shared
     175endif
     176
     177ifeq ($(ARCH),sgin32gcc)
     178# SGI 6.x with gcc for n32 ABI
     179CXX           = g++
     180CXXFLAGS      = $(OPT) -Wall -fPIC
     181LD            = g++
     182LDFLAGS       = $(OPT) -L/usr/lib32 -Wl,-woff,134 -lgen
     183SOFLAGS       = -shared
     184endif
     185
     186ifeq ($(ARCH),alphagcc)
     187# Alpha/OSF with gcc
     188CXX           = g++
     189CXXFLAGS      = $(OPT2) -Wall -fPIC
     190LD            = g++
     191LDFLAGS       = $(OPT2)
     192SOFLAGS       = -Wl,-expect_unresolved,* -shared
     193endif
     194
     195ifeq ($(ARCH),alphacxx6)
     196# Alpha/OSF with cxx6
     197CXX           = cxx
     198CXXFLAGS      = $(OPT)
     199LD            = cxx
     200LDFLAGS       = $(OPT)
     201SOFLAGS       = -shared -nocxxstd -Wl,-expect_unresolved,*,-msym
    144202endif
    145203
    … …  
    224282endif
    225283
     284ifeq ($(ARCH),linuxalphagcc)
     285# Alpha Linux with gcc
     286CXX           = g++
     287CXXFLAGS      = $(OPT2) -Wall -fPIC
     288LD            = g++
     289LDFLAGS       = $(OPT2)
     290SOFLAGS       = -shared
     291endif
     292
     293ifeq ($(ARCH),linuxmips)
     294# GNU/Linux on mips (BE/LE, O32/N32/N64) with gcc
     295CXX           = g++
     296CXXFLAGS      = $(OPT2) -Wall -fPIC
     297LD            = g++
     298LDFLAGS       = $(OPT2)
     299SOFLAGS       = -shared
     300endif
     301
    226302ifeq ($(ARCH),linuxhppa)
    227303# GNU/Linux on hppa with gcc
    … …  
    242318endif
    243319
    244 ifeq ($(ARCH),linuxarm64)
    245 # ARMv8-A (AArch64) Linux with gcc and glibc
    246 CXX           = g++
    247 CXXFLAGS      = $(OPT) -Wall -fPIC
    248 LD            = g++
    249 LDFLAGS       = $(OPT)
    250 SOFLAGS       = -shared
    251 endif
    252 
    253320ifeq ($(ARCH),freebsd4)
    254321# FreeBSD with glibc
    … …  
    293360LD            = g++
    294361LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)
    295 EXPLLINKLIBS  = $(ROOTGLIBS)
     362EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
     363# The SOFLAGS will be used to create the .dylib,
     364# the .so will be created separately
     365ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
    296366DllSuf        = so
     367else
     368DllSuf        = dylib
     369endif
     370ifneq ($(subst $(MACOSX_MINOR),,12),12)
     371LD            = g++
     372endif
    297373SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    298374endif
    … …  
    300376ifeq ($(ARCH),macosxicc)
    301377# MacOS X with Intel icc compiler
     378ifeq ($(MACOSX_MINOR),5)
     379MACOSX_MINOR := 4
     380endif
    302381CXX           = icc
    303382CXXFLAGS      = $(OPT) -fPIC -wd1476
    304383LD            = icpc
    305384LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)
    306 EXPLLINKLIBS  = $(ROOTGLIBS)
     385EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
     386# The SOFLAGS will be used to create the .dylib,
     387# the .so will be created separately
     388ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
    307389DllSuf        = so
     390else
     391DllSuf        = dylib
     392endif
    308393SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    309394endif
    … …  
    315400CXXFLAGS      = $(OPT2) -pipe -Wall -W -Woverloaded-virtual
    316401LD            = g++
    317 LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) -Wl,-rpath,$(ROOTLIBDIR)
    318 EXPLLINKLIBS  = $(ROOTGLIBS)
     402LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)
     403EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
     404# The SOFLAGS will be used to create the .dylib,
     405# the .so will be created separately
     406ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
    319407DllSuf        = so
    320 SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    321 endif
    322 
    323 ifeq ($(ARCH),macosxarm64)
    324 # Apple Silicon running macOS 11.x.
    325 CXX           = g++
    326 CXXFLAGS      = $(OPT2) -pipe -Wall -W -Woverloaded-virtual
    327 LD            = g++
    328 LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)  -Wl,-rpath,$(ROOTLIBDIR)
    329 EXPLLINKLIBS  = $(ROOTGLIBS)
    330 DllSuf        = so
     408else
     409DllSuf        = dylib
     410endif
    331411SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    332412endif
    … …  
    346426LDOPT         = -debug
    347427else
     428ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),)
     429CXXOPT        = -Z7
     430LDOPT         = -debug
     431else
    348432CXXOPT        = -O2
    349433LDOPT         = -opt:ref
     434endif
    350435endif
    351436ROOTINCDIR   := -I$(shell cygpath -m `$(RC) --incdir`)
    … …  
    355440SOFLAGS       = -DLL
    356441
    357 EXPLLINKLIBS  = $(ROOTGLIBS)
     442EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
    358443ifneq (,$(findstring $(VC_MAJOR),14 15))
    359444MT_EXE        = mt -nologo -manifest $@.manifest -outputresource:$@\;1; rm -f $@.manifest
    … …  
    377462SOFLAGS       = -shared -Wl,--enable-auto-image-base \
    378463                -Wl,--export-all-symbols
    379 EXPLLINKLIBS  = $(ROOTGLIBS)
     464EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
    380465endif
    381466
    … …  
    386471CXXFLAGS     += $(ROOTCFLAGS)
    387472LDFLAGS      += $(ROOTLDFLAGS)
    388 LIBS          = $(ROOTLIBS)
    389 GLIBS         = $(ROOTGLIBS)
     473LIBS          = $(ROOTLIBS) $(SYSLIBS)
     474GLIBS         = $(ROOTGLIBS) $(SYSLIBS)
    390475
    391476ifneq ($(ALTCC),)

  • doc/genMakefile.tcl

    r5c257a5 r0799cd1  
    346346        @mkdir -p $(@D)
    347347        @echo ">> Building $@"
     348ifeq ($(ARCH),aix5)
     349        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
     350else
    348351ifeq ($(PLATFORM),macosx)
     352# We need to make both the .dylib and the .so
    349353        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     354ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     355ifeq ($(MACOSX_MINOR),4)
     356        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     357endif
     358endif
    350359else
    351360ifeq ($(PLATFORM),win32)
    … …  
    356365else
    357366        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     367        @$(MT_DLL)
     368endif
    358369endif
    359370endif
    … …  
    362373        @mkdir -p $(@D)
    363374        @echo ">> Building $@"
     375ifeq ($(ARCH),aix5)
     376        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
     377else
    364378ifeq ($(PLATFORM),macosx)
     379# We need to make both the .dylib and the .so
    365380        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     381ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     382ifeq ($(MACOSX_MINOR),4)
     383        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     384endif
     385endif
    366386else
    367387ifeq ($(PLATFORM),win32)
    … …  
    372392else
    373393        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
     394        @$(MT_DLL)
     395endif
    374396endif
    375397endif
    … …  
    378400        @mkdir -p $(@D)
    379401        @echo ">> Building $@"
     402ifeq ($(ARCH),aix5)
     403        @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^
     404else
    380405ifeq ($(PLATFORM),macosx)
     406# We need to make both the .dylib and the .so
    381407        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     408ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
     409ifeq ($(MACOSX_MINOR),4)
     410        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
     411endif
     412endif
    382413else
    383414ifeq ($(PLATFORM),win32)
    … …  
    388419else
    389420        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
     421        @$(MT_DLL)
     422endif
    390423endif
    391424endif
Note: See TracChangeset for help on using the changeset viewer.