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