diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/axtls | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/axtls')
| -rw-r--r-- | package/axtls/Config.in | 17 | ||||
| -rw-r--r-- | package/axtls/Config.in.lib | 11 | ||||
| -rw-r--r-- | package/axtls/Makefile | 12 | ||||
| -rw-r--r-- | package/axtls/files/axhttpd.init | 2 |
4 files changed, 8 insertions, 34 deletions
diff --git a/package/axtls/Config.in b/package/axtls/Config.in deleted file mode 100644 index 7c99a9617..000000000 --- a/package/axtls/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config ADK_COMPILE_AXTLS - tristate - default n - depends on ADK_PACKAGE_LIBAXTLS || ADK_PACKAGE_AXHTTPD - -config ADK_PACKAGE_AXHTTPD - prompt "axhttpd........................... small embedded webserver" - tristate - default n - select ADK_COMPILE_AXTLS - select ADK_PACKAGE_LIBAXTLS - help - axhttpd is a small embedded web server using the axTLS library. - - http://www.axtls.co.nr/ - - diff --git a/package/axtls/Config.in.lib b/package/axtls/Config.in.lib deleted file mode 100644 index d7b64aa44..000000000 --- a/package/axtls/Config.in.lib +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_PACKAGE_LIBAXTLS - prompt "libaxtls.......................... Embedded client/server TLSv1 SSL library" - tristate - default n - select ADK_COMPILE_AXTLS - help - Embedded client/server TLSv1 SSL library - - http://www.axtls.co.nr/ - - diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 9b01f12ba..38261392f 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -13,8 +13,8 @@ PKG_DEPENDS:= libaxtls PKG_URL:= http://axtls.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} -PKG_DESCR_1:= small tls library -PKG_SECTION_1:= libs +PKG_DESCR_LIB:= small tls library +PKG_SECTION_LIB:= libs DISTFILES:= axTLS-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/axTLS @@ -22,9 +22,11 @@ WRKDIST= ${WRKDIR}/axTLS include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB})) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual -BUILD_STYLE= auto XAKE_FLAGS+= STRIP='' \ CC='${TARGET_CC}' \ OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \ @@ -37,7 +39,7 @@ do-configure: do-install: # axtls library ${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib - $(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/ + $(CP) $(WRKBUILD)/_stage/libaxtls.so* $(IDIR_LIBAXTLS)/usr/lib/ # awhttpd server ${INSTALL_DIR} ${IDIR_AXHTTPD}/www ${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init index bc11e0b4c..61572bf0f 100644 --- a/package/axtls/files/axhttpd.init +++ b/package/axtls/files/axhttpd.init @@ -17,7 +17,7 @@ start) /usr/sbin/axhttpd >>/var/log/axhttpd.access ;; stop) - killall axhttpd + pkill axhttpd ;; restart) sh $0 stop |