diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
| commit | 537a2c4eaa446e52c6ba07007eb9ae75998b5580 (patch) | |
| tree | b48cc775042b4274dce470527826007de7a7fa84 /package/dansguardian | |
| parent | 18b3987c6d890f02c80b976b6cf6835053ef1fe9 (diff) | |
| parent | ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 (diff) | |
Merge commit 'origin/confgen'
finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos
Conflicts:
.gitignore
Makefile
mk/build.mk
package/eglibc/Config.in
package/glibc/Config.in
package/uclibc++/Config.in
package/uclibc/Config.in
rules.mk
Diffstat (limited to 'package/dansguardian')
| -rw-r--r-- | package/dansguardian/Config.in | 27 | ||||
| -rw-r--r-- | package/dansguardian/Makefile | 10 |
2 files changed, 3 insertions, 34 deletions
diff --git a/package/dansguardian/Config.in b/package/dansguardian/Config.in deleted file mode 100644 index 2bffe7da6..000000000 --- a/package/dansguardian/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config ADK_PACKAGE_DANSGUARDIAN - prompt "dansguardian...................... web content filter proxy" - tristate - select ADK_PACKAGE_LIBPCRE - select ADK_PACKAGE_ZLIB - default n - help - http://dansguardian.org - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_DANSGUARDIAN -default ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice - diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 2a21584c5..7a96bda40 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -6,19 +6,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dansguardian PKG_VERSION:= 2.10.1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= pcre zlib +PKG_CXX:= DANSGUARDIAN PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= net -PKG_DEPENDS:= libpcre zlib +PKG_DEPENDS:= pcre zlib PKG_URL:= http://dansguardian.org PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ -ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) |