diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-06 17:48:12 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-06 17:48:12 +0000 |
| commit | ce265ca31ff6487adaa80e2c862aad8ebbad30f5 (patch) | |
| tree | 83816f9a0211c0594bf5f1716379b8862f3e83e0 /rules/gnuplot.make | |
| parent | 3057eed63149a7d873cf572772209e35ffdb5597 (diff) | |
| download | ptxdist-ce265ca31ff6487adaa80e2c862aad8ebbad30f5.tar.gz ptxdist-ce265ca31ff6487adaa80e2c862aad8ebbad30f5.tar.xz | |
* rules/gnuplot.make, patches/gnuplot-4.2.2, patches/gnuplot-4.2.4:
version bump to 4.2.4, make it compile again
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9447 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/gnuplot.make')
| -rw-r--r-- | rules/gnuplot.make | 62 |
1 files changed, 8 insertions, 54 deletions
diff --git a/rules/gnuplot.make b/rules/gnuplot.make index aefae648d..f35761936 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot # # Paths and names # -GNUPLOT_VERSION := 4.2.2 +GNUPLOT_VERSION := 4.2.4 GNUPLOT := gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL := $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX) @@ -29,35 +29,14 @@ GNUPLOT_DIR := $(BUILDDIR)/$(GNUPLOT) # Get # ---------------------------------------------------------------------------- -gnuplot_get: $(STATEDIR)/gnuplot.get - -$(STATEDIR)/gnuplot.get: $(gnuplot_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(GNUPLOT_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, GNUPLOT) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -gnuplot_extract: $(STATEDIR)/gnuplot.extract - -$(STATEDIR)/gnuplot.extract: $(gnuplot_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(GNUPLOT_DIR)) - @$(call extract, GNUPLOT) - @$(call patchin, GNUPLOT) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -gnuplot_prepare: $(STATEDIR)/gnuplot.prepare - GNUPLOT_PATH := PATH=$(CROSS_PATH) GNUPLOT_ENV := $(CROSS_ENV) @@ -128,46 +107,21 @@ else GNUPLOT_AUTOCONF += --without-pdf endif - -$(STATEDIR)/gnuplot.prepare: $(gnuplot_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(GNUPLOT_DIR)/config.cache) - cd $(GNUPLOT_DIR) && \ - $(GNUPLOT_PATH) $(GNUPLOT_ENV) \ - ./configure $(GNUPLOT_AUTOCONF) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -gnuplot_compile: $(STATEDIR)/gnuplot.compile - $(STATEDIR)/gnuplot.compile: $(gnuplot_compile_deps_default) - @$(call targetinfo, $@) - - cd $(GNUPLOT_DIR)/src && $(GNUPLOT_PATH) make gnuplot - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -gnuplot_install: $(STATEDIR)/gnuplot.install - -$(STATEDIR)/gnuplot.install: $(gnuplot_install_deps_default) - @$(call targetinfo, $@) - @$(call install, GNUPLOT) - @$(call touch, $@) + @$(call targetinfo) + cd $(GNUPLOT_DIR)/src && $(GNUPLOT_PATH) $(MAKE) gnuplot $(PARALLELMFLAGS) + @$(call touch) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -gnuplot_targetinstall: $(STATEDIR)/gnuplot.targetinstall - -$(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/gnuplot.targetinstall: + @$(call targetinfo) @$(call install_init, gnuplot) @$(call install_fixup, gnuplot,PACKAGE,gnuplot) @@ -186,7 +140,7 @@ endif @$(call install_finish, gnuplot) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |