--- chewbacca/event/Makefile 2008/09/23 07:57:55 1.2 +++ chewbacca/event/Makefile 2009/04/10 15:01:44 1.12 @@ -1,6 +1,6 @@ #***************************************************************************** # -# FILE NAME: $Id: Makefile,v 1.1.1.1 2008/09/23 07:19:54 mocchiut Exp $ +# FILE NAME: $Id: Makefile,v 1.11 2008-11-04 09:44:53 mocchiut Exp $ # VERSION: # AUTHOR: Nergal S.r.l. # DATE: @@ -15,7 +15,9 @@ #------------------------------------------------------------------------------ +ifneq ($(MAKECMDGOALS),distclean) include $(BASEDIR)/event/Make.def +endif #------------------------------------------------------------------------------ CFLAGS += -I $(EVNT_DIR_INC) -I $(ROOT_DIR_INC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -DPIC @@ -97,31 +99,20 @@ libyoda.so.0.0.0: $(TARGETLIB) $(EXTLIB) $(CXX) \ $(PAM_BIT) -o $@ \ - -shared -nostdlib \ + -shared \ -Wl,-soname \ -Wl,libyoda.so.0 \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../crti.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/crtbeginS.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/crtendS.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../crtn.o \ -Wl,--whole-archive \ $^ \ -Wl,--no-whole-archive - libyoda.a: $(TARGETLIB) $(EXTLIB) cd $(OBJDIR) ; \ pwd ;\ for sub_lib in $(TARGETLIB) $(EXTLIB) ; do \ $(AR) -x $$sub_lib ; \ done ;\ - $(AR) -scrv libyoda.a *.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../crti.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/crtbeginS.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/crtendS.o \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../crtn.o -# $(AR) -scrv libyoda.a *.o - + $(AR) -scrv libyoda.a *.o $(TARGETLIB) : ${OBJS} $(AR) -scrv $@ $? @@ -201,7 +192,7 @@ $(ROOTEVENTDICT).cpp: ${DICT_HEADER_FILES} echo $(ROOTCINT) -f $@ -c ${INCLUDES} $^ ;\ - LD_LIBRARY_PATH=$(ROOT_LIB) $(ROOTCINT) -f $@ -c ${INCLUDES} $^ + LD_LIBRARY_PATH=$(ROOT_LIB):$(LD_LIBRARY_PATH); $(ROOTCINT) -f $@ -c ${INCLUDES} $^ clean: clean-subdir rm -f $(TARGETLIB) ${OBJS} $(OBJDIR)/.*.d libyoda*