X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG4%2FMakefile;h=179d114c1104ad9bf51c298edd7513e1234a302b;hb=2142305c9a4b658655cc6e17d8aa19181db80560;hp=d8961562b27abb0c5da7da40a81e50b2f1cf144e;hpb=f9cea31c748bdc44068bda92a902021cb420e707;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG4/Makefile b/PWG4/Makefile
index d8961562b27..179d114c110 100644
--- a/PWG4/Makefile
+++ b/PWG4/Makefile
@@ -1,41 +1,69 @@
+PACKAGE = invalid-only-for-proof
 
 include $(ROOTSYS)/test/Makefile.arch
+include lib$(PACKAGE).pkg
 
-default-target: libGamma.so
+ifndef PACKCXXFLAGS
+   PACKCXXFLAGS = $(CXXFLAGS)
+endif
 
-ALICEINC      = -I.
+ALICEINC = -I.
 
 ### define include dir for local case and par case
-ifneq ($(ANALYSIS_NEW_INCLUDE),)
-  ALICEINC += -I../$(ESD_INCLUDE) -I../$(ANALYSIS_NEW_INCLUDE)
-else
-  ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include
-  endif
+ifneq ($(STEERBase_INCLUDE),)
+  ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
+ifneq ($(ESD_INCLUDE),)
+  ALICEINC += -I../$(ESD_INCLUDE)
 endif
 
-# for building of Gamma.par
-ifneq ($(GAMMA_INCLUDE),)
-  ALICEINC += -I../$(GAMMA_INCLUDE)
+ifneq ($(AOD_INCLUDE),)
+  ALICEINC += -I../$(AOD_INCLUDE)
 endif
 
-CXXFLAGS     += $(ALICEINC) -g
+ifneq ($(ANALYSIS_INCLUDE),)
+  ALICEINC += -I../$(ANALYSIS_INCLUDE)
+endif
 
-PACKAGE = Gamma
-include lib$(PACKAGE).pkg
+ifneq ($(ANALYSISalice_INCLUDE),)
+  ALICEINC += -I../$(ANALYSISalice_INCLUDE)
+endif
 
-DHDR_Gamma := $(DHDR)
-HDRS_Gamma := $(HDRS)
-SRCS_Gamma := $(SRCS) G__$(PACKAGE).cxx
-OBJS_Gamma := $(SRCS_Gamma:.cxx=.o)
+ifneq ($(JETAN_INCLUDE),)
+  ALICEINC += -I../$(JETAN_INCLUDE)
+endif
 
-PARFILE       = $(PACKAGE).par
+ifneq ($(PWG4PartCorr_INCLUDE),)
+  ALICEINC += -I../$(PWG4PartCorr_INCLUDE)
+endif
 
+ifneq ($(PWG4JetTasks_INCLUDE),)
+  ALICEINC += -I../$(PWG4JetTasks_INCLUDE)
+endif
 
-lib$(PACKAGE).so: $(OBJS_Gamma)
+ifneq ($(JETAN_INCLUDE),)
+  ALICEINC += -I../$(JETAN_INCLUDE)
+endif
+
+
+# only if no par file was loaded before
+ifeq ($(ALICEINC),-I.)
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include
+    ALICEINC += -I$(ALICE_ROOT)/JETAN   # some extra includes
+  endif
+endif
+
+CXXFLAGS += $(ALICEINC) -g
+
+SRCS         += G__$(PACKAGE).cxx
+OBJS          = $(SRCS:.cxx=.o)
+
+lib$(PACKAGE).so: $(OBJS)
 	@echo "Linking" $@ ...
 	@/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
 	@$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
 	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -44,46 +72,12 @@ endif
 	@echo "done"
 
 %.o:    %.cxx %.h
-	$(CXX) $(CXXFLAGS) -c $< -o $@
+	$(CXX) $(PACKCXXFLAGS) -c $< -o $@
 
 clean:
-	@rm -f $(OBJS_Gamma) *.so G__$(PACKAGE).* $(PARFILE)
+	@rm -f $(OBJS) *.so G__$(PACKAGE).*
 
 G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
-	@echo "Generating dictionary ..."
-	rootcint -f $@ -c $(ALICEINC) $^
-
-### CREATE PAR FILE
-
-$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_Gamma) $(SRCS_Gamma) $(DHDR_Gamma) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
-	@echo "Creating archive" $@ ...
-	@tar cfzh $@ $(PACKAGE)
-	@rm -rf $(PACKAGE)
-	@echo "done"
+	@echo "Generating dictionaries ..." $(ALICEINC)
+	rootcint -f $@ -c $(CINTFLAGS) $(ALICEINC) $^
 
-$(PACKAGE)/Makefile: Makefile #.$(PACKAGE)
-	@echo Copying $< to $@ with transformations
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@sed 's/include \$$(ROOTSYS)\/test\/Makefile.arch/include Makefile.arch/' < $^ > $@
-
-$(PACKAGE)/Makefile.arch: $(ROOTSYS)/test/Makefile.arch
-	@echo Copying $< to $@
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@cp -a $^ $@
-
-$(PACKAGE)/PROOF-INF: PROOF-INF.$(PACKAGE)
-	@echo Copying $< to $@
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@cp -a -r $^ $@
-
-$(PACKAGE)/%: %
-	@echo Copying $< to $@
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	@cp -a $< $@
-
-test-%.par: %.par
-	@echo "INFO: The file $< is now tested, in case of an error check in par-tmp."
-	@mkdir -p par-tmp
-	@cd par-tmp; tar xfz ../$<;	cd $(subst .par,,$<); PROOF-INF/BUILD.sh
-	@rm -rf par-tmp
-	@echo "INFO: Testing succeeded (already cleaned up)"