svn commit: r920452 - in /incubator/lcf/trunk/modules/mod-authz-annotate: ./ Makefile

[kw...@apache.org]

Author: kwright
Date: Mon Mar  8 18:59:12 2010
New Revision: 920452

URL: http://svn.apache.org/viewvc?rev=920452&view=rev
Log:
Move to final package, and modify make file to work in a non-debian environment.

Added:
    incubator/lcf/trunk/modules/mod-authz-annotate/
      - copied from r920354, incubator/lcf/trunk/modules/libapache-mod-authz-annotate/
Modified:
    incubator/lcf/trunk/modules/mod-authz-annotate/Makefile

Modified: incubator/lcf/trunk/modules/mod-authz-annotate/Makefile
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/mod-authz-annotate/Makefile?rev=920452&r1=920354&r2=920452&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/mod-authz-annotate/Makefile (original)
+++ incubator/lcf/trunk/modules/mod-authz-annotate/Makefile Mon Mar  8 18:59:12 2010
@@ -22,18 +22,15 @@
 ##
 
 #   the used tools
-APXS=apxs
+APXS=apxs2
 
-CURL_INCLUDES=
-#NOTE: If libcurl is compiled with gssapi support, it brings in heimdal.
-#      This could be bad, see mc.sqa:7649 for more information.
 CURL_LIBS=-lcurl
 
 
 #   the default target
 all: mod_authz_annotate.so
 
-CPPFLAGS = -I. $(DEFS) -Wall -Werror
+CPPFLAGS = -Wall -Werror
 LDFLAGS = $(CURL_LIBS)
 
 APXS_CPPFLAGS = ${shell [ -n "${CPPFLAGS}" ] && echo ${CPPFLAGS} | sed -e 's/\([^ ]*\)/-Wc,\1/g'}
@@ -41,6 +38,7 @@
 
 mod_authz_annotate.so: mod_authz_annotate.c
 	$(APXS) -c $(APXS_CPPFLAGS) $(APXS_CFLAGS) $(APXS_LDFLAGS) $<
+	cp .libs/mod_authz_annotate.so .
 
 #   install the DSO file into the Apache installation
 #   and activate it in the Apache configuration
@@ -50,4 +48,6 @@
 #   cleanup
 clean:
 	-rm -f mod_authz_annotate.so
+	-rm -rf .libs
+