|
 |
c60383e |
diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
|
|
|
c60383e |
--- root-trunk.orig/math/unuran/Module.mk 2010-11-25 20:41:32.000000000 +0100
|
|
|
c60383e |
+++ root-trunk/math/unuran/Module.mk 2010-11-25 20:51:47.190704977 +0100
|
|
|
c60383e |
@@ -20,7 +20,7 @@
|
|
|
c60383e |
UNURANETAG := $(call stripsrc,$(UNURANDIRS)/headers.d)
|
|
|
c60383e |
UNRCFG := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
|
|
|
30d9d78 |
|
|
|
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)) \
|
|
|
c60383e |
@@ -69,10 +69,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)
|
|
|
c60383e |
@@ -125,12 +124,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)
|