Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refactored Makefile

  • Loading branch information...
commit 4097f28d287d9ca953d15814b01d81231e476738 1 parent c78d699
@spiritloose authored
Showing with 7 additions and 28 deletions.
  1. +0 −1  .gitignore
  2. +6 −21 Makefile.in
  3. +1 −1  configure.ac
  4. +0 −5 t/Makefile.in
View
1  .gitignore
@@ -4,7 +4,6 @@
*.lo
*.o
*.slo
-/t/test.conf
Makefile
/autom4te*.cache
/config.log
View
27 Makefile.in
@@ -1,22 +1,17 @@
-##
-## Makefile -- Build procedure for PSGI Apache module
-## Autogenerated via ``apxs -n psgi -g''.
-##
-
PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
-# the used tools
APXS=@APXS@
APACHECTL=@APACHECTL@
PERL=@PERL@
+TESTS=t
+
builddir=.
top_srcdir=$(shell $(APXS) -q exp_datadir)
top_builddir=$(shell $(APXS) -q exp_datadir)
include $(shell $(APXS) -q installbuilddir)/special.mk
-# additional defines, includes and libraries
ifdef MOD_PSGI_DEBUG
DEBUG_DEFS=-DDEBUG
else
@@ -26,18 +21,15 @@ DEFS=-DMOD_PSGI_VERSION=\"$(PACKAGE_VERSION)\" $(DEBUG_DEFS)
INCLUDES=$(shell $(PERL) -MExtUtils::Embed -e ccopts)
LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts)
-# the default target
all: local-shared-build
-# install the shared object file into Apache
install: install-modules-yes
-# cleanup
clean:
rm -f mod_psgi.o mod_psgi.lo mod_psgi.slo mod_psgi.la
-realclean: clean
- rm -f Makefile
+maintainer-clean:
+ git clean -fdx
configure: configure.ac
autoconf
@@ -47,18 +39,11 @@ mod_psgi.c: ppport.h
ppport.h:
$(PERL) -MDevel::PPPort -e 'Devel::PPPort::WriteFile'
-testconf:
- $(MAKE) -C t conf
-
test:
- $(MAKE) -C t test
+ prove $(TESTS)
-# install and activate shared object by reloading Apache to
-# force a reload of the shared object file
reload: install restart
-# the general Apache start/restart/stop
-# procedures
start:
$(APACHECTL) start
restart:
@@ -77,4 +62,4 @@ dist: ppport.h configure
rm -fr $(DIST_DIR)
gzip --best $(DIST_FILE)
-.PHONY: testconf realclean
+.PHONY: test maintainer-clean dist
View
2  configure.ac
@@ -33,7 +33,7 @@ if test "$PERL" = no; then
fi
AC_SUBST(PERL)
-AC_OUTPUT([Makefile t/Makefile t/Config.pm])
+AC_OUTPUT([Makefile t/Config.pm])
echo "
$PACKAGE_NAME $PACKAGE_VERSION configuration:
View
5 t/Makefile.in
@@ -1,5 +0,0 @@
-TESTS=.
-all: test
-test:
- prove -I.. $(TESTS)
-.PHONY: test
Please sign in to comment.
Something went wrong with that request. Please try again.