diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-02-25 12:38:47 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-02-25 12:39:33 -0800 |
commit | d120ffad9716fbb83806d9755b7b5fd28fdb758b (patch) | |
tree | 6c2fde419978edb8d420dbb352c74746626f6fdc /GNUmakefile | |
parent | 1f29d32cb095cbc21a095772db2fbaf216781f97 (diff) | |
download | unicorn-d120ffad9716fbb83806d9755b7b5fd28fdb758b.tar.gz |
rename http11 => unicorn/http11
Avoid conflicting with existing (and future) Mongrel installs in case either changes. Of course, this also allows us more freedom to experiment and break the API if needed... However, I'm only planning on making minor changes to remove the amount of C code we have to maintain and possibly some minor performance improvements.
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/GNUmakefile b/GNUmakefile index dfb33ff..0992767 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -21,22 +21,22 @@ T_log := $(subst .rb,$(log_suffix),$(T)) T_n_log := $(subst .n,$(log_suffix),$(T_n)) test_prefix = $(CURDIR)/test/install-$(RUBY_VERSION) -http11_deps := $(addprefix ext/http11/, \ +http11_deps := $(addprefix ext/unicorn/http11/, \ ext_help.h http11.c http11_parser.c http11_parser.h \ http11_parser.rl http11_parser_common.rl) inst_deps := $(wildcard bin/*) $(wildcard lib/*.rb) \ $(wildcard lib/*/*.rb) $(http11_deps) -ext/http11/http11_parser.c: ext/http11/http11_parser.rl +ext/unicorn/http11/http11_parser.c: ext/unicorn/http11/http11_parser.rl cd $(@D) && ragel $(<F) -C -G2 -o $(@F) -ext/http11/Makefile: ext/http11/extconf.rb +ext/unicorn/http11/Makefile: ext/unicorn/http11/extconf.rb cd $(@D) && $(ruby) $(<F) -ext/http11/http11.$(DLEXT): $(http11_deps) ext/http11/Makefile +ext/unicorn/http11/http11.$(DLEXT): $(http11_deps) ext/unicorn/http11/Makefile $(MAKE) -C $(@D) -lib/http11.$(DLEXT): ext/http11/http11.$(DLEXT) +lib/unicorn/http11.$(DLEXT): ext/unicorn/http11/http11.$(DLEXT) @mkdir -p lib install -m644 $< $@ -http11: lib/http11.$(DLEXT) +http11: lib/unicorn/http11.$(DLEXT) $(test_prefix)/.stamp: $(inst_deps) $(MAKE) clean-http11 @@ -88,11 +88,11 @@ install: bin/unicorn $(prep_setup_rb) clean-http11: - -$(MAKE) -C ext/http11 clean - $(RM) ext/http11/Makefile lib/http11.$(DLEXT) + -$(MAKE) -C ext/unicorn/http11 clean + $(RM) ext/unicorn/http11/Makefile lib/unicorn/http11.$(DLEXT) setup_rb_files := .config InstalledFiles -prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C ext/http11 clean +prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C ext/unicorn/http11 clean clean: clean-http11 $(RM) $(setup_rb_files) |