summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-20 16:11:36 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-20 16:11:36 +0000
commit50537cb3df3e0a9e6ad872201e28c5d92c0709cd (patch)
tree67a0fd872a6ed9a093ab37e0b0e1249ada936aeb
parent8bb11c763e6a03d99be7215885c4d6440a74b7d7 (diff)
modify build system to use apxs
git-svn-id: file:///home/lennart/svn/public/mod_dnssd/trunk@4 634eccf8-0006-0410-930e-e16565b0b7de
-rw-r--r--Makefile29
-rw-r--r--Makefile.in3
-rw-r--r--config.m439
-rw-r--r--mod_dnssd.c (renamed from mod_zeroconf.c)0
4 files changed, 29 insertions, 42 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a484ebc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,29 @@
+APXS=/usr/bin/apxs2
+APACHECTL=apache2ctl
+LIBS=$(shell pkg-config --libs howl)
+CFLAGS=$(shell pkg-config --cflags howl)
+
+all: mod_dnssd.so
+
+mod_dnssd.so: mod_dnssd.c
+ $(APXS) -c $(CFLAGS) $(LIBS) mod_dnssd.c
+
+install: all
+ $(APXS) -i -a -n dnssd mod_dnssd.so
+
+clean:
+ rm -rf *.o *.so *.loT .deps/ *.la *.lo *.slo .libs
+
+reload: install restart
+
+start:
+ $(APACHECTL) start
+
+restart:
+ $(APACHECTL) restart
+
+stop:
+ $(APACHECTL) stop
+
+
+.PHONY: all install clean reload start restart stop
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 167b343..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-
-include $(top_srcdir)/build/special.mk
-
diff --git a/config.m4 b/config.m4
deleted file mode 100644
index 280169f..0000000
--- a/config.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl modules enabled in this directory by default
-
-dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-
-APACHE_MODPATH_INIT(zeroconf)
-
-APR_ADDTO(LT_LDFLAGS,-export-dynamic)
-
-APACHE_MODULE(zeroconf, ZeroConf support, , , no, [
- AC_ARG_WITH(howl, APACHE_HELP_STRING(--with-howl=DIR,use a specific howl library),
- [
- if test "x$withval" != "xyes" && test "x$withval" != "x"; then
- ap_howl_base="$withval"
- fi
- ])
- if test "x$ap_howl_base" = "x"; then
- AC_MSG_CHECKING([for howl location])
- AC_CACHE_VAL(ap_cv_howl,[
- for dir in /usr/ /usr/local/ ; do
- if test -d $dir && test -f $dir/include/howl/howl.h; then
- ap_cv_howl=$dir
- break
- fi
- done
- ])
- ap_howl_base=$ap_cv_howl
- if test "x$ap_howl_base" = "x"; then
- enable_howl=no
- AC_MSG_RESULT([not found])
- else
- AC_MSG_RESULT([$ap_howl_base])
- fi
- fi
- APR_ADDTO(INCLUDES, [-I${ap_howl_base}/include/howl])
- APR_ADDTO(LDFLAGS, [-L${ap_howl_base}/lib])
- APR_ADDTO(LIBS, [-lhowl -lpthread])
-])
-
-APACHE_MODPATH_FINISH
diff --git a/mod_zeroconf.c b/mod_dnssd.c
index 6246436..6246436 100644
--- a/mod_zeroconf.c
+++ b/mod_dnssd.c