root/root-unuran.patch
Mattias Ellert 30d9d78de2 * Thu Jul 29 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.26.00c-3
- Correct license tags for: cint, core and rootfit
- Regenerate source tarball due to upstream retag (again)
2010-07-31 14:38:22 +02:00

39 lines
1.5 KiB
Diff

diff -ur root-5.26.00b.orig/math/unuran/Module.mk root-5.26.00b/math/unuran/Module.mk
--- root-5.26.00b.orig/math/unuran/Module.mk 2010-02-11 14:20:23.000000000 +0100
+++ root-5.26.00b/math/unuran/Module.mk 2010-06-10 09:18:04.620574784 +0200
@@ -19,7 +19,7 @@
UNURANETAG := $(UNURANDIRS)/headers.d
UNRCFG := $(UNURANDIRS)/$(UNRVERS)/config.h
-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell cd $(UNURANDIRS); gunzip -c $(UNRVERS).tar.gz | tar tf -))
+UNRTARCONTENT:=
UNRS := $(filter %.c,\
$(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT))\
$(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
@@ -68,10 +68,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)
@@ -123,12 +122,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)
@echo "Generating dictionary $@..."