Changeset 78 in JEM-EUSO for esaf_lal

Timestamp:

Apr 16, 2013, 9:43:33 AM (11 years ago)

Author:

barrand

Message:

G.Barrand : SHEX variable to handle correctly shlib extension on Mac (dylib) and Linux (so)

Location:

esaf_lal/trunk/esaf

Files:

• history (modified) (2 diffs)
• macros/lib/GNUmakefile (modified) (3 diffs)
• packages/config.gmk (modified) (2 diffs)
• packages/reconstruction/GNUmakefile (modified) (1 diff)
• packages/simulation/GNUmakefile (modified) (1 diff)
• packages/simulation/detector/tools/GNUmakefile (modified) (1 diff)

esaf_lal/trunk/esaf/history

@@ +1 @@
+
+16 Avril 2013 : G.Barrand :
+- config.gmk : Darwin : SHEX variable to handle the .dylib shared lib
+  extension on Darwin and .so on Linux.
+- macros/lib/GNUmakefile, packages/reconstruction/GNUmakefile,
+  packages/config.gmk, packages/simulation/GNUmakefile,
+  packages/simulation/detector/tools/GNUmakefile : use SHEX.
 
 15 Avril 2013 : G.Barrand :
 - source_me.csh_example : Darwin : handle DYLD_LIBRARY_PATH.
+- config.gmk : Darwin : UNAME and SO_OPTS variable to help building
+  shared libs. For Darwin, LIBPREFIX to esaf_. It avoids a clash
+  with the ROOT/libGui and the esaf/libgui due to Mac case insensitive
+  file system.
 - Atmosphere.hh, Ltrace_optF1v4.c, Ltracemain_optF1v4.c,
   NIdealFocalSurface.c,Ktrace_optF1v1.c,DetectorGeometry.cc,
@@ -9 +20 @@
 - RootInputModule.cc, JemEnergyModule.cc, RobustModule.cc : Darwin :
     uint -> unsigned int
-- config.gmk : Darwin : UNAME and SO_OPTS variable to help building
-  shared libs. For Darwin, LIBPREFIX to esaf_. It avoids a clash
-  with the ROOT/libGui and the esaf/libgui due to Mac case insensitive
-  file system.
 - macros/lib/GNUmakefile, externals/lowtran/GNUmakefile,
   externals/cfortran/GNUmakefile : Darwin : use SO_OPTS.

esaf_lal/trunk/esaf/macros/lib/GNUmakefile

@@ -33 +33 @@
 
 sources := $(wildcard *.h)
-objects := $(patsubst %.h,%.so,$(sources))
+objects := $(patsubst %.h,%.$(SHEX),$(sources))
 dict    := $(patsubst %.h,%Dict.cc,$(sources)) 
 
@@ -40 +40 @@
 
 
-$(objects): %.so: %.h
+$(objects): %.$(SHEX): %.h
         rm -f `echo $< |sed 's/.h$$/Dict.cc/'` `echo $< |sed 's/.h$$/Dict.h/'`
         rootcint -f `echo $< |sed 's/.h$$/Dict.cc/'` -c $(RCINTFLAGS) $< `echo $< |sed 's/.h$$/LinkDef.hh/'` 
@@ -47 +47 @@
 
 clean:
-        rm *.so
+        rm *.$(SHEX)

esaf_lal/trunk/esaf/packages/config.gmk

@@ -130 +130 @@
 ifeq ($(UNAME),Darwin) 
 LIBPREFIX := esaf_
+SHEX := dylib
 else
 LIBPREFIX :=
+SHEX := so
 endif
 
 # The goal
-PACKAGELIB := $(LIBDIR)/lib$(LIBPREFIX)$(PACKAGENAME).so
+PACKAGELIB := $(LIBDIR)/lib$(LIBPREFIX)$(PACKAGENAME).$(SHEX)
 
 #rlibmap
@@ -143 +145 @@
 ESAFMAP:=$(ESAFINSTALL)/.rootmap
 
-PACKAGELIBDEP:=$(ROOTLIBDEP:%=$(ROOTSYS)/lib/lib%.so)
-PACKAGELIBDEP+=$(ESAFLIBDEP:%=$(LIBDIR)/lib%.so)
+PACKAGELIBDEP:=$(ROOTLIBDEP:%=$(ROOTSYS)/lib/lib%.$(SHEX))
+PACKAGELIBDEP+=$(ESAFLIBDEP:%=$(LIBDIR)/lib%.$(SHEX))
 
 ifndef CONFIG_DONE

esaf_lal/trunk/esaf/packages/reconstruction/GNUmakefile

@@ -32 +32 @@
 libraries += $(patsubst %,-l$(LIBPREFIX)%,$(libs) $(extralibs))
 
-libdep = $(patsubst %,$(LIBDIR)/lib$(LIBPREFIX)%.so,$(libs) $(extralibs))
+libdep = $(patsubst %,$(LIBDIR)/lib$(LIBPREFIX)%.$(SHEX),$(libs) $(extralibs))
 
 CXXFLAGS += -I$(ESAFINSTALL)/packages/common/base/include/

esaf_lal/trunk/esaf/packages/simulation/GNUmakefile

@@ -35 +35 @@
 
 libraries = $(patsubst %,-l$(LIBPREFIX)%,$(libs))
-libdep = $(patsubst %,$(LIBDIR)/lib$(LIBPREFIX)%.so,$(libs))
+libdep = $(patsubst %,$(LIBDIR)/lib$(LIBPREFIX)%.$(SHEX),$(libs))
 
 CXXFLAGS += -I$(ESAFINSTALL)/packages/common/base/include/

esaf_lal/trunk/esaf/packages/simulation/detector/tools/GNUmakefile

@@ -36 +36 @@
 shared := OpticsAnalysis
 
-LIBTARGET := lib$(shared).so
+LIBTARGET := lib$(shared).$(SHEX)
 linkdef := OALinkDef
 dict := G___OADict