1c00eef2cf
- Remove java-devel build dependency (not needed with Fedora's libhdfs) - Adapt to pythia8 >= 8.1.80
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
diff -ur root-5.34.13.orig/math/unuran/Module.mk root-5.34.13/math/unuran/Module.mk
|
|
--- root-5.34.13.orig/math/unuran/Module.mk 2013-12-01 11:58:21.000000000 +0100
|
|
+++ root-5.34.13/math/unuran/Module.mk 2013-12-03 20:11:58.916479324 +0100
|
|
@@ -31,7 +31,7 @@
|
|
$(wildcard $(UNRDIRS)/src/uniform/*.c) \
|
|
$(wildcard $(UNRDIRS)/src/urng/*.c)
|
|
else
|
|
-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
|
|
+UNRTARCONTENT:=
|
|
UNRS := $(filter %.c, \
|
|
$(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
|
|
$(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
|
|
@@ -81,10 +81,9 @@
|
|
##### local rules #####
|
|
.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
|
|
|
|
-include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG)
|
|
+include/%.h: $(UNURANDIRI)/%.h
|
|
cp $< $@
|
|
|
|
-$(UNURANDEP): $(UNRCFG)
|
|
$(UNRS): $(UNURANETAG)
|
|
|
|
$(UNURANETAG): $(UNRSRCS)
|
|
@@ -137,12 +136,12 @@
|
|
GNUMAKE=$(MAKE) ./configure CC="$$ACC" \
|
|
CFLAGS="$$ACFLAGS");
|
|
|
|
-$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
|
|
+$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \
|
|
$(MAINLIBS) $(UNURANLIBDEP)
|
|
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
|
|
"$(SOFLAGS)" libUnuran.$(SOEXT) $@ \
|
|
"$(UNURANO) $(UNURANDO)" \
|
|
- "$(UNURANLIBEXTRA) $(UNRO)"
|
|
+ "$(UNURANLIBEXTRA) -lunuran"
|
|
|
|
$(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
|
|
$(MAKEDIR)
|