Changeset 432 in svn

Timestamp:

Jun 17, 2009, 10:04:02 PM (15 years ago)

Author:

Xavier Rouby

Message:

-Dlinux/-Dmacos/-Dwindows automatically set in Makefile

Location:

trunk

Files:

• Makefile (modified) (4 diffs)
• genMakefile.tcl (modified) (1 diff)

trunk/Makefile

@@ -14 +14 @@
 endif
 
+
+ifneq (,$(findstring macos,$(ARCH)))
+CXXFLAGS += -Dmacos
+else 
+ifneq (,$(findstring win,$(ARCH)))
+CXXFLAGS += -Dwindows
+else
+CXXFLAGS += -Dlinux
+endif
+endif
+
+
 SrcSuf = cc
 
@@ -20 +32 @@
 LIBS = $(ROOTLIBS) -lEG $(SYSLIBS)
 GLIBS = $(ROOTGLIBS) $(SYSLIBS)
-        
+
 ###
 
@@ -113 +125 @@
 tmp/src/SmearUtil.$(ObjSuf): \
         src/SmearUtil.$(SrcSuf)
+tmp/src/PdgParticle.$(ObjSuf): \
+        src/PdgParticle.$(SrcSuf)
 tmp/src/TriggerUtil.$(ObjSuf): \
         src/TriggerUtil.$(SrcSuf)
@@ -338 +352 @@
         tmp/src/CaloUtil.$(ObjSuf) \
         tmp/src/SmearUtil.$(ObjSuf) \
+        tmp/src/PdgParticle.$(ObjSuf) \
         tmp/src/TriggerUtil.$(ObjSuf) \
         tmp/src/BFieldProp.$(ObjSuf) \

trunk/genMakefile.tcl

@@ -218 +218 @@
 ifneq (,$(findstring macos,$(ARCH)))
 CXXFLAGS += -Dmacos
-else ifneq (,$(findstring win,$(ARCH)))
+else 
+ifneq (,$(findstring win,$(ARCH)))
 CXXFLAGS += -Dwindows
 else
 CXXFLAGS += -Dlinux
+endif
 endif