c60383e16e
- Drop patches fixed upstream: root-linker-scripts.patch, root-dpm-rfio.patch, root-missing-explicit-link.patch, root-split-latex.patch, root-cern-filename.patch, root-make-3.82.patch, root-fonttype-combobox-dtor.patch - New sub-packages: root-genetic, root-graf-fitsio, root-hist-factory, root-proof-pq2 - Make root-io a separate package again - the circular dependency with the root-core package was resolved upstream
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
|
|
--- root-trunk.orig/math/unuran/Module.mk 2010-11-25 20:41:32.000000000 +0100
|
|
+++ root-trunk/math/unuran/Module.mk 2010-11-25 20:51:47.190704977 +0100
|
|
@@ -20,7 +20,7 @@
|
|
UNURANETAG := $(call stripsrc,$(UNURANDIRS)/headers.d)
|
|
UNRCFG := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
|
|
|
|
-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)) \
|
|
@@ -69,10 +69,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)
|
|
@@ -125,12 +124,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)
|