Mods for MacOSX
authoralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 20 Dec 2004 04:40:03 +0000 (04:40 +0000)
committeralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 20 Dec 2004 04:40:03 +0000 (04:40 +0000)
ALIROOT/binaliroot.pkg
MONITOR/binmonitorCheck.pkg
MONITOR/binmonitorGDC.pkg
RAW/binalimdc.pkg
build/Makefile.macosx
build/clean.tpl
build/header.tpl
build/module.tpl

index d661960..4065f8b 100644 (file)
@@ -1,3 +1,5 @@
+#-*- Mode: Makefile -*-
+
 SRCS:=aliroot.cxx
 CSRCS:=fpu.c
 
@@ -15,8 +17,17 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONmapping \
         TPHIC FASTSIM microcern RAW AliL3Src AliL3Comp AliL3Misc AliL3Hough
 
 ifeq (macosx,$(ALICE_TARGET))
+
+@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS))
+@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT))
+@PACKAGE@LIBSINIT:=$(filter-out mevsim,$(@PACKAGE@LIBSINIT))
+@PACKAGE@LIBSINIT:=$(filter-out HBTP,$(@PACKAGE@LIBSINIT))
+@PACKAGE@LIBSINIT:=$(filter-out herwig,$(@PACKAGE@LIBSINIT))
+@PACKAGE@LIBSINIT:=$(filter-out EPEMGEN,$(@PACKAGE@LIBSINIT))
+PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%)
 # On Mac OS X gcc we need g2c
 ELIBS+=g2c
+
 endif
 
 # The two variables below are used for the creation of profile target.
@@ -77,7 +88,3 @@ ARLIBS:= \
 
 SHLIBS:= $(BINLIBDIRS) -lEVGEN -lpythia6 -lAliPythia6 -lpdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
 
-ifeq (macosx,$(ALICE_TARGET))
-# On Mac OS X gcc we need g2c
-SHLIBS+=-lg2c
-endif
index fab99a1..715722d 100644 (file)
@@ -24,3 +24,11 @@ else
 ELIBS:= pythia6 pdf microcern
 
 endif
+
+ifeq (macosx,$(ALICE_TARGET))
+@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS))
+@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT))
+PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%)
+# On Mac OS X gcc we need g2c
+ELIBS+=g2c
+endif
index 6519738..a97460c 100644 (file)
@@ -24,3 +24,11 @@ else
 ELIBS:= pythia6 pdf microcern
 
 endif
+
+ifeq (macosx,$(ALICE_TARGET))
+@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS))
+@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT))
+PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%)
+# On Mac OS X gcc we need g2c
+ELIBS+=g2c
+endif
index b0bbcff..49d9fc0 100644 (file)
@@ -24,6 +24,9 @@ ELIBS:=ESD RAW MDC STEER TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc Ali
 
 #ifneq (,$(findstring macosx,$(ALICE_TARGET)))
 ifeq (macosx,$(ALICE_TARGET))
+@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS))
+@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT))
+PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%)
 # On Mac OS X gcc we need g2c
 ELIBS+=g2c
 endif
index 2d6cb64..28bcfe6 100644 (file)
@@ -31,38 +31,6 @@ DEPENDFFLAGS  = $(FFLAGS)
 # rootcint flags
 CINTFLAGS     = 
 
-DICTNOLOAD:=
-
-DICTLOAD:= -Wl,-u,_G__cpp_setupG__AliL3Comp -Wl,-u,_G__cpp_setupG__AliL3Hough \
--Wl,-u,_G__cpp_setupG__AliL3Misc -Wl,-u,_G__cpp_setupG__AliL3Src \
--Wl,-u,_G__cpp_setupG__AliPythia6 -Wl,-u,_G__cpp_setupG__CONTAINERS \
--Wl,-u,_G__cpp_setupG__CRT -Wl,-u,_G__cpp_setupG__EMCAL \
--Wl,-u,_G__cpp_setupG__ESD -Wl,-u,_G__cpp_setupG__EVGEN \
--Wl,-u,_G__cpp_setupG__FASTSIM -Wl,-u,_G__cpp_setupG__FMDbase \
--Wl,-u,_G__cpp_setupG__FMDrec -Wl,-u,_G__cpp_setupG__FMDsim \
--Wl,-u,_G__cpp_setupG__ITS -Wl,-u,_G__cpp_setupG__MUONbase \
--Wl,-u,_G__cpp_setupG__MUONgeometry -Wl,-u,_G__cpp_setupG__MUONmapping \
--Wl,-u,_G__cpp_setupG__MUONrec -Wl,-u,_G__cpp_setupG__MUONsim \
--Wl,-u,_G__cpp_setupG__PHOS -Wl,-u,_G__cpp_setupG__PMDbase \
--Wl,-u,_G__cpp_setupG__PMDrec -Wl,-u,_G__cpp_setupG__PMDsim \
--Wl,-u,_G__cpp_setupG__RAW -Wl,-u,_G__cpp_setupG__RICH \
--Wl,-u,_G__cpp_setupG__STARTbase -Wl,-u,_G__cpp_setupG__STARTrec \
--Wl,-u,_G__cpp_setupG__STARTsim -Wl,-u,_G__cpp_setupG__STEER \
--Wl,-u,_G__cpp_setupG__STRUCT -Wl,-u,_G__cpp_setupG__TEPEMGEN \
--Wl,-u,_G__cpp_setupG__THbtp -Wl,-u,_G__cpp_setupG__THerwig \
--Wl,-u,_G__cpp_setupG__THijing -Wl,-u,_G__cpp_setupG__TMEVSIM \
--Wl,-u,_G__cpp_setupG__TOFbase -Wl,-u,_G__cpp_setupG__TOFrec \
--Wl,-u,_G__cpp_setupG__TOFsim -Wl,-u,_G__cpp_setupG__TPCbase \
--Wl,-u,_G__cpp_setupG__TPCfast -Wl,-u,_G__cpp_setupG__TPCrec \
--Wl,-u,_G__cpp_setupG__TPCsim -Wl,-u,_G__cpp_setupG__TPHIC \
--Wl,-u,_G__cpp_setupG__TRDbase -Wl,-u,_G__cpp_setupG__TRDfast \
--Wl,-u,_G__cpp_setupG__TRDrec -Wl,-u,_G__cpp_setupG__TRDsim \
--Wl,-u,_G__cpp_setupG__VZERObase -Wl,-u,_G__cpp_setupG__VZEROrec \
--Wl,-u,_G__cpp_setupG__VZEROsim \
--Wl,-u,_G__cpp_setupG__ZDCbase -Wl,-u,_G__cpp_setupG__ZDCrec \
--Wl,-u,_G__cpp_setupG__ZDCsim -Wl,-u,_G__cpp_setupG__hijing \
--Wl,-u,_G__cpp_setupG__pythia6
-
 LD            = export MACOSX_DEPLOYMENT_TARGET=10.3 ; \
                unset LD_PREBIND ; \
                g++
index a88760b..355d1f8 100644 (file)
@@ -1,3 +1,4 @@
+#-*- Mode: Makefile -*-
 
 #  Clean option for the whole module
 clean-@MODULE@:
index b0c50ba..c2dae5c 100644 (file)
@@ -27,6 +27,7 @@ PACKCXXFLAGS:=
 PACKCFLAGS:=
 PACKDYFLAGS:=
 PACKSOFLAGS:=
+PACKLDFLAGS:=
 EXPORT:=
 EHDRS:=
 CINTHDRS:=
index 0d410b2..27ec7ec 100644 (file)
@@ -33,6 +33,12 @@ else
 endif
 endif
 
+ifndef PACKLDFLAGS
+@PACKAGE@LDFLAGS:=$(LDFLAGS)
+else
+@PACKAGE@LDFLAGS:=$(PACKLDFLAGS)
+endif
+
 ifndef PACKDCXXFLAGS
 @PACKAGE@DCXXFLAGS:=$(CXXFLAGSNO)
 else
@@ -227,9 +233,9 @@ ifndef ALIQUIET
          @echo "***** Making executable $@ *****"
 endif
 ifeq ($(ALIPROFILE),YES)
-       $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@
+       $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@
 else
-         $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@
+         $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@
 endif
 
 $(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk