--- chewbacca/event/Makefile	2008/09/23 07:19:54	1.1.1.1
+++ chewbacca/event/Makefile	2008/09/24 08:47:56	1.9
@@ -1,6 +1,6 @@
 #*****************************************************************************
 #
-# FILE NAME:    $Id: Makefile,v 1.5 2008-04-02 13:30:54 messineo Exp $    
+# FILE NAME:    $Id: Makefile,v 1.8 2008/09/23 15:43:25 mocchiut Exp $    
 # VERSION:      
 # AUTHOR:       Nergal S.r.l.
 # DATE:
@@ -96,32 +96,29 @@
 
 libyoda.so.0.0.0: $(TARGETLIB) $(EXTLIB)
 	$(CXX) \
-	$PAM_BIT -o $@ \
+	$(PAM_BIT) -o $@ \
 	-shared -nostdlib \
         -Wl,-soname \
 	-Wl,libyoda.so.0 \
-	-Wl,--whole-archive \
 	/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/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  \
+	$(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  
-
+	/usr/lib/gcc/i386-redhat-linux/3.4.6/../../../crtn.o
 
 $(TARGETLIB) : ${OBJS}
 	$(AR) -scrv $@ $?