diff options
| author | Eric Wong <e@80x24.org> | 2015-01-28 19:00:32 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2015-02-04 20:12:49 +0000 |
| commit | fe83ead4eae6f011fa15f506cd80cb4256813a92 (patch) | |
| tree | 99bbf14d22bff7e509a931cfe6c7468af8713996 | |
| parent | 11810564cc4b6b8bfdc679f5a6384f4af6debe40 (diff) | |
| download | unicorn-fe83ead4eae6f011fa15f506cd80cb4256813a92.tar.gz | |
Ensure we have a NEWS file for building the gem beforehand. We don't need to polute lib/ with object files, either.
| -rw-r--r-- | GNUmakefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index 4c40dc9..8bd63ee 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -57,10 +57,7 @@ $(ext)/Makefile: $(ext)/extconf.rb $(c_files) cd $(@D) && $(RUBY) extconf.rb $(ext)/unicorn_http.$(DLEXT): $(ext)/Makefile $(MAKE) -C $(@D) -lib/unicorn_http.$(DLEXT): $(ext)/unicorn_http.$(DLEXT) - @mkdir -p lib - install -m644 $< $@ -http: lib/unicorn_http.$(DLEXT) +http: $(ext)/unicorn_http.$(DLEXT) test-install: $(test_prefix)/.stamp $(test_prefix)/.stamp: $(inst_deps) @@ -85,6 +82,7 @@ test-unit: $(wildcard test/unit/test_*.rb) $(slow_tests): $(test_prefix)/.stamp @$(MAKE) $(shell $(awk_slow) $@) +# ensure we can require just the HTTP parser without the rest of unicorn test-require: $(ext)/unicorn_http.$(DLEXT) $(RUBY) --disable-gems -I$(ext) -runicorn_http -e Unicorn @@ -134,7 +132,6 @@ $(T): $(test_prefix)/.stamp install: $(bins) $(ext)/unicorn_http.c $(prep_setup_rb) - $(RM) lib/unicorn_http.$(DLEXT) $(RM) -r .install-tmp mkdir .install-tmp cp -p bin/* .install-tmp @@ -150,7 +147,7 @@ prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean clean: -$(MAKE) -C $(ext) clean -$(MAKE) -C Documentation clean - $(RM) $(ext)/Makefile lib/unicorn_http.$(DLEXT) + $(RM) $(ext)/Makefile $(RM) $(setup_rb_files) $(t_log) $(RM) -r $(test_prefix) man @@ -160,7 +157,10 @@ man html: pkg_extra := GIT-VERSION-FILE lib/unicorn/version.rb LATEST NEWS \ $(ext)/unicorn_http.c $(man1_paths) -.manifest: $(ext)/unicorn_http.c man +NEWS: + $(OLDDOC) prepare + +.manifest: $(ext)/unicorn_http.c man NEWS (git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \ LC_ALL=C sort > $@+ cmp $@+ $@ || mv $@+ $@ |