.. as we'll be adding the version information of another package later.
Signed-off-by: Petr Pudlak <[email protected]>
---
.gitignore | 2 +-
Makefile.am | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0b65795..548cec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@
# /
/.hsenv
/Makefile
-/hs-lens-version
+/hs-pkg-versions
/Makefile.ghc
/Makefile.ghc.bak
/Makefile.in
diff --git a/Makefile.am b/Makefile.am
index c9e64cd..c63e61d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -272,7 +272,7 @@ CLEANFILES = \
$(addsuffix /*.o,$(HS_DIRS)) \
$(addsuffix /*.$(HTEST_SUFFIX)_hi,$(HS_DIRS)) \
$(addsuffix /*.$(HTEST_SUFFIX)_o,$(HS_DIRS)) \
- hs-lens-version \
+ hs-pkg-versions \
Makefile.ghc \
Makefile.ghc.bak \
$(PYTHON_BOOTSTRAP) \
@@ -1174,7 +1174,7 @@ HS_SRCS = $(HS_LIBTESTBUILT_SRCS)
# select the last line of output and extract the version number,
# padding with 0s if needed
-hs-lens-version:
+hs-pkg-versions:
ghc-pkg list --simple-output lens \
| sed -r -e '$$!d' \
-e 's/^lens-([0-9]+(\.[0-9]+)*)/\1 0 0 0/' \
@@ -1187,11 +1187,11 @@ HS_MAKEFILE_GHC_SRCS = $(HS_SRC_PROGS:%=%.hs)
if WANT_HSTESTS
HS_MAKEFILE_GHC_SRCS += $(HS_TEST_PROGS:%=%.hs)
endif
-Makefile.ghc: $(HS_MAKEFILE_GHC_SRCS) Makefile hs-lens-version \
+Makefile.ghc: $(HS_MAKEFILE_GHC_SRCS) Makefile hs-pkg-versions \
| $(built_base_sources) $(HS_BUILT_SRCS)
$(GHC) -M -dep-makefile $@ -dep-suffix $(HPROF_SUFFIX) \
-dep-suffix $(HTEST_SUFFIX) $(HFLAGS) -itest/hs \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED)
$(HS_MAKEFILE_GHC_SRCS)
# Since ghc -M does not generate dependency line for object files, dependencies
# from a target executable seed object (e.g. src/hluxid.o) to objects which
@@ -1207,29 +1207,29 @@ Makefile.ghc: $(HS_MAKEFILE_GHC_SRCS) Makefile
hs-lens-version \
@include_makefile_ghc@
-%.o: hs-lens-version
+%.o: hs-pkg-versions
@echo '[GHC]: $@ <- $^'
@$(GHC) -c $(HFLAGS) \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED)
$(@:%.o=%.hs)
# For TH+profiling we need to compile twice: Once without profiling,
# and then once with profiling. See
#
http://www.haskell.org/ghc/docs/7.0.4/html/users_guide/template-haskell.html#id636646
if HPROFILE
-%.$(HPROF_SUFFIX)_o: %.o hs-lens-version
+%.$(HPROF_SUFFIX)_o: %.o hs-pkg-versions
@echo '[GHC|prof]: $@ <- $^'
@$(GHC) -c $(HFLAGS) \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
$(HPROFFLAGS) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED) \
$(@:%.$(HPROF_SUFFIX)_o=%.hs)
endif
-%.$(HTEST_SUFFIX)_o: hs-lens-version
+%.$(HTEST_SUFFIX)_o: hs-pkg-versions
@echo '[GHC|test]: $@ <- $^'
@$(GHC) -c $(HTEST_FLAGS) \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED)
$(@:%.$(HTEST_SUFFIX)_o=%.hs)
%.hi: %.o ;
@@ -1239,17 +1239,17 @@ endif
if HPROFILE
$(HS_SRC_PROGS): %: %.$(HPROF_SUFFIX)_o | stamp-directories
else
-$(HS_SRC_PROGS): %: %.o hs-lens-version | stamp-directories
+$(HS_SRC_PROGS): %: %.o hs-pkg-versions | stamp-directories
endif
@echo '[GHC-link]: $@'
$(GHC) $(HFLAGS) \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
$(HPROFFLAGS) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED) --make
$(@:%=%.hs)
@rm -f $(notdir $@).tix
@touch "$@"
-$(HS_TEST_PROGS): %: %.$(HTEST_SUFFIX)_o hs-lens-version \
+$(HS_TEST_PROGS): %: %.$(HTEST_SUFFIX)_o hs-pkg-versions \
| stamp-directories $(built_python_sources)
@if [ "$(HS_NODEV)" ]; then \
echo "Error: cannot run unittests without the development" \
@@ -1258,7 +1258,7 @@ $(HS_TEST_PROGS): %: %.$(HTEST_SUFFIX)_o hs-lens-version \
fi
@echo '[GHC-link|test]: $@'
$(GHC) $(HTEST_FLAGS) \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED) --make
$(@:%=%.hs)
@rm -f $(notdir $@).tix
@touch "$@"
@@ -2643,11 +2643,11 @@ $(APIDOC_HS_DIR)/index.html: $(HS_LIBTESTBUILT_SRCS)
Makefile
$(HS_LIBTESTBUILT_SRCS)
.PHONY: TAGS
-TAGS: $(GENERATED_FILES) hs-lens-version
+TAGS: $(GENERATED_FILES) hs-pkg-versions
rm -f TAGS
$(GHC) -e ":etags TAGS_hs" -v0 \
$(filter-out -O -Werror,$(HFLAGS)) \
- $(shell cat hs-lens-version) \
+ $(shell cat hs-pkg-versions) \
-osuf tags.o \
-hisuf tags.hi \
-lcurl \
--
2.2.0.rc0.207.ga3a616c
