Changes for MacOSX

diff --git a/HLT/Makefile.conf b/HLT/Makefile.conf
index 17049ef..d2dc1e5 100644 (file)
--- a/HLT/Makefile.conf
+++ b/HLT/Makefile.conf
@@ -82,9 +82,9 @@ CINTCXXFLAGS  = -pipe -W -Wall -fsigned-char \
                 -DG__REGEXP  -DG__UNIX -DG__SHAREDLIB \
                 -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
 LD              = $(CXX)
-#SOFLAGS         = -bundle -flat_namespace -Xlinker -bind_at_load -undefined suppress
-SOFLAGS         = -bundle -flat_namespace -undefined suppress
-DYFLAGS         = -dynamiclib -flat_namespace -undefined suppress \
+#SOFLAGS         = -bundle -Xlinker -bind_at_load -undefined suppress
+SOFLAGS         = -bundle -undefined suppress
+DYFLAGS         = -dynamiclib -undefined suppress \
                   -compatibility_version 1 -current_version 1.0.0 
 LDFLAGS         = -O $(EXTRALDFLAGS) -L/sw/lib -ldl
 else

diff --git a/PDF/commons.F b/PDF/commons.F
new file mode 100644 (file)
index 0000000..10585c6
--- /dev/null
+++ b/PDF/commons.F
@@ -0,0 +1,16 @@
+      BLOCK DATA PFDCOM
+#include "pdf/pilot.h"
+#include "pdf/w50510.inc"
+#include "pdf/w50511a.inc"
+#include "pdf/w50514.inc"
+#include "pdf/w50514w.inc"
+#include "pdf/w50515.inc"
+#include "pdf/w50519.inc"
+#include "pdf/w50518.inc"
+#include "pdf/w50518a.inc"
+#include "pdf/w5051p2.inc"
+#include "pdf/w505121.inc"
+#include "pdf/w505110.inc"
+#include "pdf/w505120.inc"
+#include "pdf/w505122.inc"
+      END

diff --git a/RALICE/scripts/macgcclib b/RALICE/scripts/macgcclib
index 36a2d88..548ffe6 100644 (file)
--- a/RALICE/scripts/macgcclib
+++ b/RALICE/scripts/macgcclib
@@ -28,12 +28,12 @@ rootcint -f zzzralicedict.cxx -c RALICEHeaders.h RALICELinkDef.h
 g++ $gccroot *.cxx   
 #
 # Creating ralice.so library 
-g++ -v -bundle -flat_namespace -undefined dynamic_lookup -o $lib1 *.o
+g++ -v -bundle -undefined dynamic_lookup -o $lib1 *.o
 #
 # Creating ralice.dylib library 
-g++ -v -dynamiclib -flat_namespace -undefined dynamic_lookup -single_module -o $lib2 *.o
+g++ -v -dynamiclib -undefined dynamic_lookup -single_module -o $lib2 *.o
 ### On some systems the following extra "-read_only_relocs" flag might be needed
-# g++ -v -dynamiclib -flat_namespace -undefined dynamic_lookup -single_module -read_only_relocs -o $lib2 *.o
+# g++ -v -dynamiclib -undefined dynamic_lookup -single_module -read_only_relocs -o $lib2 *.o
 #
 rm zzzralicedict.*
 rm *.o

diff --git a/build/Makefile.macosx b/build/Makefile.macosx
index 340381b..74511a7 100644 (file)
--- a/build/Makefile.macosx
+++ b/build/Makefile.macosx
@@ -37,13 +37,13 @@ LD            = export MACOSX_DEPLOYMENT_TARGET=10.3 ; \
 LDFLAGS       = $(OPT) 
 
 SHLD        := $(LD)
-SOFLAGS      := -bundle -flat_namespace -undefined dynamic_lookup
+SOFLAGS      := -bundle -undefined dynamic_lookup
 #SHLIB        := -lg2c
 SHLIB        :=
 SOEXT       := so
 
 DYLD        := $(LD)
-DYFLAGS       = -dynamiclib -flat_namespace -undefined dynamic_lookup -single_module
+DYFLAGS       = -dynamiclib -undefined dynamic_lookup -single_module
 DYLIB        :=
 DYEXT        := dylib
 

diff --git a/build/Makefile.macosxxlc b/build/Makefile.macosxxlc
index 15adebf..d28367d 100644 (file)
--- a/build/Makefile.macosxxlc
+++ b/build/Makefile.macosxxlc
@@ -25,7 +25,7 @@ CXXFLAGS      = $(CXXOPT) -qpic -I/sw/include \
                 -qflttrap=overflow:zerodivide:invalid:inexact:enable
 CXXFLAGSNO    = $(CXXNOOPT) -qpic -I/sw/include \
                 -qflttrap=overflow:zerodivide:invalid:inexact:enable
-CFLAGS       = -qpic -qextname \
+CFLAGS       = -qpic -qextname -I/sw/include \
                 -qflttrap=overflow:zerodivide:invalid:inexact:enable
 FFLAGS        = $(CLIBFOPT)  $(FOPT) -qpic \
                 -qflttrap=overflow:zerodivide:invalid:inexact:enable
@@ -42,7 +42,7 @@ LDFLAGS       = $(OPT)
 SHLD        := export MACOSX_DEPLOYMENT_TARGET=10.3 ; \
                unset LD_PREBIND ; \
                xlC
-SOFLAGS      := -bundle -flat_namespace -undefined dynamic_lookup
+SOFLAGS      := -bundle -undefined dynamic_lookup
 #SHLIB        := -lg2c
 SHLIB        :=
 SOEXT       := so
@@ -50,7 +50,7 @@ SOEXT              := so
 DYLD        := export MACOSX_DEPLOYMENT_TARGET=10.3 ; \
                unset LD_PREBIND ; \
                xlC
-DYFLAGS       = -qmkshrobj -flat_namespace -undefined dynamic_lookup -single_module
+DYFLAGS       = -qmkshrobj -undefined dynamic_lookup -single_module
 DYLIB        :=
 DYEXT        := dylib
 

diff --git a/build/makeg2cso.sh b/build/makeg2cso.sh
index 45ac317..0421ba9 100755 (executable)
--- a/build/makeg2cso.sh
+++ b/build/makeg2cso.sh
@@ -6,6 +6,6 @@ ar -x /sw/lib/libg2c.a
 export MACOSX_DEPLOYMENT_TARGET=10.3
 unset LD_PREBIND
 rm -f ${out}.so ${out}.dylib
-g++ -bundle -flat_namespace -undefined dynamic_lookup -o ${out}.so `ls *.o | grep -v buggy`
-g++ -dynamiclib -flat_namespace -undefined dynamic_lookup -single_module -o ${out}.dylib `ls *.o | grep -v buggy`
+g++ -bundle -undefined dynamic_lookup -o ${out}.so `ls *.o | grep -v buggy`
+g++ -dynamiclib -undefined dynamic_lookup -single_module -o ${out}.dylib `ls *.o | grep -v buggy`