diff -uNr trunk.ORIG/bin/thisgarfpp.sh trunk/bin/thisgarfpp.sh --- trunk.ORIG/bin/thisgarfpp.sh 2012-05-04 12:32:43.000000000 +0900 +++ trunk/bin/thisgarfpp.sh 2012-05-04 12:42:05.000000000 +0900 @@ -0,0 +1,7 @@ +THIS=$(dirname ${BASH_ARGV[0]}) +export GARFIELD_HOME=$(cd ${THIS}/..;pwd) +export HEED_DATABASE=$GARFIELD_HOME/Heed/heed++/database +export ROOTSYS=/opt/root/root_v5.32.02-macosx10.7-x86_64 +source $ROOTSYS/bin/thisroot.sh +export DYLD_LIBRARY_PATH=$GARFIELD_HOME/Library:$DYLD_LIBRARY_PATH +export PATH=$GARFIELD_HOME/bin:$PATH diff -uNr trunk.ORIG/makefile trunk/makefile --- trunk.ORIG/makefile 2012-05-04 11:12:45.000000000 +0900 +++ trunk/makefile 2012-05-04 12:13:18.000000000 +0900 @@ -42,11 +42,14 @@ LDFLAGS = `root-config --glibs` `root-config --ldflags`-lGeom \ -lgfortran -lm +SOEXT = dylib +SOFLAGS = -O -dynamiclib -install_name +SOLDFLAGS = -single_module -undefined dynamic_lookup +ALLOBJS = $(OBJECTS) $(wildcard $(OBJDIR)/Heed/*.o) + all: $(TARGETS) @echo Creating library libGarfield... - @ar rcs $(LIBDIR)/libGarfield.a $(OBJECTS) \ - $(wildcard $(OBJDIR)/Heed/*.o) - @ranlib $(LIBDIR)/libGarfield.a + @$(CXX) $(SOFLAGS) @rpath/libGarfield.$(SOEXT) -o $(LIBDIR)/libGarfield.$(SOEXT) $(ALLOBJS) $(SOLDFLAGS) @touch $(OBJDIR)/last_updated_on @echo Finished. @@ -70,12 +73,15 @@ clean: @echo Removing object files... @$(RM) $(OBJDIR)/*.o - @echo Removing libraries... - @$(RM) $(LIBDIR)/*.a @cd $(HEEDDIR); make clean @echo Removing dictionary... @$(RM) $(SRCDIR)/GarfieldDict.C +distclean: clean + @echo Removing libraries... + @$(RM) $(LIBDIR)/*.$(SOEXT) + @$(RM) *~ + $(OBJDIR)/AvalancheMicroscopic.o: \ $(SRCDIR)/AvalancheMicroscopic.cc \ $(INCDIR)/AvalancheMicroscopic.hh \