Permalink
Browse files

moved source files to src directory

  • Loading branch information...
bmuller committed Jan 5, 2012
1 parent 1b2a53e commit 2c9be9dd2de2861473e3906241c72e315d4afb59
View
@@ -1,25 +1,5 @@
-noinst_LTLIBRARIES = libmodauthopenid.la
-noinst_PROGRAMS = db_info
-noinst_DATA = mod_auth_openid.la
+SUBDIRS = src
EXTRA_DIST = UPGRADE
ACLOCAL_AMFLAGS = -I acinclude.d
-
-INCLUDES = ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${SQLITE3_CFLAGS} ${PCRE_CFLAGS} ${CURL_CFLAGS}
-AM_LDFLAGS = ${OPKELE_LIBS} ${SQLITE3_LDFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ${APR_LDFLAGS}
-
-libmodauthopenid_la_SOURCES = mod_auth_openid.cpp MoidConsumer.cpp moid_utils.cpp http_helpers.cpp \
- SessionManager.cpp config.h http_helpers.h mod_auth_openid.h MoidConsumer.h moid_utils.h \
- SessionManager.h types.h
-
-db_info_SOURCES = db_info.cpp
-db_info_LDFLAGS = -lmodauthopenid
-db_info_DEPENDENCIES = libmodauthopenid.la
-
-install-exec-local:
- ${APXS} -i -a -n 'authopenid' mod_auth_openid.la
-
-mod_auth_openid.la: libmodauthopenid.la
- ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \
- ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS}
View
@@ -1,2 +1,2 @@
#! /bin/sh
-libtoolize -f -c && aclocal -I ./acinclude.d && autoheader && automake -ac && autoconf && ./configure "$@"
+libtoolize -f -c && aclocal -I ./acinclude.d -I /usr/share/aclocal && autoheader && automake -ac -Woverride && autoconf && ./configure "$@"
View
@@ -1,6 +1,6 @@
AC_INIT([mod_auth_openid], [0.6], [bmuller@butterfat.net])
AC_DEFINE([PACKAGE_URL],["http://findingscience.com/mod_auth_openid"],[project url])
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(src/config.h)
AM_INIT_AUTOMAKE()
AC_CONFIG_MACRO_DIR([acinclude.d])
@@ -85,6 +85,7 @@ fi
AC_CONFIG_FILES([
Makefile
+ src/Makefile
])
AC_OUTPUT
View
@@ -0,0 +1,21 @@
+noinst_LTLIBRARIES = libmodauthopenid.la
+noinst_PROGRAMS = db_info
+noinst_DATA = mod_auth_openid.la
+
+INCLUDES = ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${SQLITE3_CFLAGS} ${PCRE_CFLAGS} ${CURL_CFLAGS}
+AM_LDFLAGS = ${OPKELE_LIBS} ${SQLITE3_LDFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ${APR_LDFLAGS}
+
+libmodauthopenid_la_SOURCES = mod_auth_openid.cpp MoidConsumer.cpp moid_utils.cpp http_helpers.cpp \
+ SessionManager.cpp config.h http_helpers.h mod_auth_openid.h MoidConsumer.h moid_utils.h \
+ SessionManager.h types.h
+
+db_info_SOURCES = db_info.cpp
+db_info_LDFLAGS = -lmodauthopenid
+db_info_DEPENDENCIES = libmodauthopenid.la
+
+install-exec-local:
+ ${APXS} -i -a -n 'authopenid' mod_auth_openid.la
+
+mod_auth_openid.la: libmodauthopenid.la
+ ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \
+ ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.

0 comments on commit 2c9be9d

Please sign in to comment.