summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/modules.mk2
-rw-r--r--mk/vars.mk2
-rw-r--r--package/DirectFB/Makefile21
-rw-r--r--package/cxxtools/Makefile14
-rw-r--r--package/cyrus-sasl/Makefile2
-rw-r--r--package/dhcp-forwarder/Makefile10
-rw-r--r--package/eglibc/Makefile4
-rw-r--r--package/flex/Makefile16
-rw-r--r--package/glib/Makefile4
-rw-r--r--package/glibc/Makefile4
-rw-r--r--package/iproute2/Makefile7
-rw-r--r--package/iproute2/patches/patch-configure18
-rw-r--r--package/iproute2/patches/patch-netem_Makefile14
-rw-r--r--package/iptables/Makefile15
-rw-r--r--package/l2tpns/patches/patch-Makefile11
-rw-r--r--package/libXfont/Makefile3
-rw-r--r--package/libart/patches/100-cross_compile_fix.patch4
-rwxr-xr-xpackage/libcli/Makefile13
-rw-r--r--package/libmpdclient/Makefile17
-rw-r--r--package/libnetfilter_conntrack/Makefile19
-rw-r--r--package/libnfnetlink/Makefile16
-rw-r--r--package/libnl/Makefile3
-rw-r--r--package/libp11/Makefile5
-rw-r--r--package/libusb-compat/Makefile8
-rw-r--r--package/links/Makefile1
-rw-r--r--package/linux-atm/Makefile15
-rw-r--r--package/neon/Makefile5
-rw-r--r--package/sdl/Makefile5
28 files changed, 184 insertions, 74 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 89e8d0053..0be466b1f 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -926,7 +926,9 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
,11))
ZLIB:=lib/zlib_deflate/zlib_deflate
+ifneq (${ADK_LINUX_NATIVE},y)
ZLIB+=lib/zlib_inflate/zlib_inflate
+endif
$(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
$(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \
diff --git a/mk/vars.mk b/mk/vars.mk
index d83f7eca8..0e40ab3c6 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -117,7 +117,7 @@ FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh
SED:= sed -i -e
LINUX_DIR:= $(BUILD_DIR)/linux
-LINUX_HEADER_DIR:= $(STAGING_TARGET_DIR)/linux-header
+LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header
KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \
KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 3f2b8297b..c9b404fe2 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -46,26 +46,29 @@ endif
post-install:
${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
- ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/
+ ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc
$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}
${CP} $(WRKINST)/usr/lib/lib{direct,fusion}*.so* \
- $(IDIR_DIRECTFB)/usr/lib/
+ $(IDIR_DIRECTFB)/usr/lib
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers/libdirectfb_linux_input.so \
- ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers/
+ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/systems/*.so \
- ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/systems/
+ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/systems
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/wm/*.so \
- ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/wm/
+ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/wm
$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFB{Font,ImageProvider,VideoProvider}
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont/*.so \
- ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont/
+ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider/*.so \
- ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider/
+ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \
- ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/
+ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider
directfb-dev-install:
- ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include/
+ ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include
${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/directfb-config \
+ ${IDIR_DIRECTFB_DEV}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index fb1c36bd1..7c02db6ec 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -14,9 +14,12 @@ PKG_BUILDDEP:= libiconv
PKG_URL:= http://www.tntnet.org/
PKG_SITES:= http://www.tntnet.org/download/
+PKG_SUBPKGS:= CXXTOOLS CXXTOOLS_DEV
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \
@@ -30,8 +33,15 @@ TARGET_CFLAGS+= -fPIC
TARGET_CXXFLAGS+= -fPIC
CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr'
-post-install:
+cxxtools-install:
${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib
+
+cxxtools-dev-install:
+ ${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* \
+ ${IDIR_CXXTOOLS_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/bin
+ ${CP} ${WRKINST}/usr/bin/cxxtools-config ${IDIR_CXXTOOLS_DEV}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 291186507..19ad1e27e 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -64,7 +64,7 @@ pre-build:
CC="${CC_FOR_BUILD}" \
LINK="${CC_FOR_BUILD} -o makemd5 -lc" \
LIBS="" \
- CFLAGS="" \
+ CFLAGS="${CFLAGS_FOR_BUILD}" \
LDFLAGS="" \
CPPFLAGS="" \
makemd5
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index ff483b392..de365f1bf 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -4,16 +4,14 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dhcp-forwarder
-PKG_VERSION:= 0.8
+PKG_VERSION:= 0.9
PKG_RELEASE:= 1
-PKG_MD5SUM:= fb3670dee9f71af1e55ac5dcd64e213e
+PKG_MD5SUM:= 63630db269ac17523ad085b67277b1c3
PKG_DESCR:= DHCP relay agent
PKG_SECTION:= dhcp
PKG_URL:= http://www.nongnu.org/dhcp-fwd/
PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -25,8 +23,8 @@ post-install:
${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin \
${IDIR_DHCP_FORWARDER}/etc
${INSTALL_DATA} ${WRKBUILD}/contrib/dhcp-fwd.conf \
- ${IDIR_DHCP_FORWARDER}/etc/
+ ${IDIR_DHCP_FORWARDER}/etc
${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcp-fwd \
- ${IDIR_DHCP_FORWARDER}/usr/sbin/
+ ${IDIR_DHCP_FORWARDER}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index a97b594ec..6f947f515 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -70,7 +70,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/
endif
$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/
- -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \
+ -for file in libc libcrypt libdl libm libresolv librt libnsl libutil libnss_dns libnss_files; do \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \
done
@@ -84,7 +84,7 @@ eglibc-dev-install:
-cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
- -for file in libc libcrypt libdl libm libresolv librt libutil; do \
+ -for file in libc libcrypt libdl libm libresolv librt libnsl libutil; do \
cd $(IDIR_EGLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
done
# header package
diff --git a/package/flex/Makefile b/package/flex/Makefile
index f77e4650a..d2ca5ee34 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -12,15 +12,21 @@ PKG_SECTION:= lang
PKG_URL:= http://flex.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
-include ${TOPDIR}/mk/package.mk
+PKG_SUBPKGS:= FLEX FLEX_DEV
-$(eval $(call PKG_template,FLEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+include ${TOPDIR}/mk/package.mk
-CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
- ac_cv_func_realloc_0_nonnull=yes
+$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FLEX_DEV,flex-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+flex-install:
${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
+flex-dev-install:
+ ${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libfl.a \
+ ${IDIR_FLEX_DEV}/usr/lib
+
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glib/Makefile b/package/glib/Makefile
index f98c73cc9..37816d5cb 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -45,10 +45,12 @@ pre-configure:
ifneq ($(OStype),Darwin)
(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
./configure --prefix=$(STAGING_HOST_DIR) \
+ --with-libiconv=gnu \
);
- env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}
+ ${MAKE} -C ${WRKBUILD} V=1
$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
+ $(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin
${MAKE} -C ${WRKBUILD} clean
endif
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 43321ad22..54a0567ac 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -46,7 +46,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/
endif
$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/
- -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
+ -for file in libc libcrypt libdl libm libresolv librt libnsl libutil libnss_compat libnss_dns libnss_files; do \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \
done
@@ -57,7 +57,7 @@ glibc-dev-install:
-cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
- -for file in libc libcrypt libdl libm libresolv librt libutil; do \
+ -for file in libc libcrypt libdl libm libresolv librt libnsl libutil; do \
cd $(IDIR_GLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
done
# header package
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 1cab309f2..3c6ff16eb 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -19,7 +19,7 @@ PKGSB_TC:= iptables
PKGSD_TC_ATM:= iproute2 traffic control ATM support library
PKGSS_TC_ATM:= tc libatm
PKGSB_TC_ATM:= linux-atm
-PKGSD_TC_IPT:= iproute 2 traffic control IPTables support library
+PKGSD_TC_IPT:= iproute2 traffic control IPTables support library
PKGSS_TC_IPT:= tc iptables
PKGSB_TC_IPT:= iptables
PKGSD_IFSTAT:= iproute2 interface statistics utility
@@ -42,10 +42,11 @@ $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
$(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_RTMON},${PKG_SECTION}))
$(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PKG_SECTION}))
+CONFIG_STYLE:= minimal
TARGET_CFLAGS+= -D_GNU_SOURCE
XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
- HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include"
-CONFIGURE_ENV+= IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
+ CFLAGS_FOR_BUILD+="-I${LINUX_HEADER_DIR}/include"
+CONFIGURE_ENV+= CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
ip-install:
${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin}
diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure
index a5cf58b45..13b8fc905 100644
--- a/package/iproute2/patches/patch-configure
+++ b/package/iproute2/patches/patch-configure
@@ -7,8 +7,14 @@
- additionally output the full compiler command before running
it
--- iproute2-2.6.37.orig/configure 2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/configure 2011-01-18 02:37:39.800716449 +0100
-@@ -15,7 +15,8 @@ int main(int argc, char **argv) {
++++ iproute2-2.6.37/configure 2011-02-25 21:01:53.000000000 +0100
+@@ -1,4 +1,5 @@
+ #! /bin/bash
++set -x
+ # This is not an autconf generated configure
+ #
+ INCLUDE=${1:-"$PWD/include"}
+@@ -15,7 +16,8 @@ int main(int argc, char **argv) {
return 0;
}
EOF
@@ -18,7 +24,7 @@
if [ $? -eq 0 ]
then
echo "TC_CONFIG_ATM:=y" >>Config
-@@ -49,7 +50,8 @@ int main(int argc, char **argv)
+@@ -49,7 +51,8 @@ int main(int argc, char **argv)
EOF
@@ -28,7 +34,7 @@
then
echo "TC_CONFIG_XT:=y" >>Config
echo "using xtables"
-@@ -86,7 +88,8 @@ int main(int argc, char **argv) {
+@@ -86,7 +89,8 @@ int main(int argc, char **argv) {
}
EOF
@@ -38,7 +44,7 @@
if [ $? -eq 0 ]
then
-@@ -126,7 +129,8 @@ int main(int argc, char **argv) {
+@@ -126,7 +130,8 @@ int main(int argc, char **argv) {
}
EOF
@@ -48,7 +54,7 @@
if [ $? -eq 0 ]
then
-@@ -149,18 +153,8 @@ check_ipt()
+@@ -149,18 +154,8 @@ check_ipt()
check_ipt_lib_dir()
{
diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile
index b0aa792f7..e49ab4415 100644
--- a/package/iproute2/patches/patch-netem_Makefile
+++ b/package/iproute2/patches/patch-netem_Makefile
@@ -1,27 +1,27 @@
--- iproute2-2.6.37.orig/netem/Makefile 2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/netem/Makefile 2011-01-18 02:19:41.386925447 +0100
-@@ -2,13 +2,13 @@ DISTGEN = maketable normal pareto pareto
++++ iproute2-2.6.37/netem/Makefile 2011-02-25 19:59:34.000000000 +0100
+@@ -1,14 +1,12 @@
+ DISTGEN = maketable normal pareto paretonormal
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
- HOSTCC ?= $(CC)
+-HOSTCC ?= $(CC)
-CCOPTS = $(CBUILD_CFLAGS)
-+HOSTCFLAGS ?=
LDLIBS += -lm
all: $(DISTGEN) $(DISTDATA)
$(DISTGEN):
- $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
-+ $(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I../include -o $@ $@.c -lm
%.dist: %
./$* > $@
-@@ -17,7 +17,7 @@ experimental.dist: maketable experimenta
+@@ -17,7 +15,7 @@ experimental.dist: maketable experimenta
./maketable experimental.dat > experimental.dist
stats: stats.c
- $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
-+ $(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I../include -o $@ $@.c -lm
install: all
mkdir -p $(DESTDIR)$(LIBDIR)/tc
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index e20e117c5..9a39ffe60 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -16,10 +16,10 @@ PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state
PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss
PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6
PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject
-PKG_URL:= http://www.netfilter.org
+PKG_URL:= http://www.netfilter.org/
PKG_SITES:= http://www.netfilter.org/projects/iptables/files/
-PKG_SUBPKGS:= IPTABLES IP6TABLES
+PKG_SUBPKGS:= IPTABLES IP6TABLES IPTABLES_DEV
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -30,22 +30,27 @@ include ${TOPDIR}/mk/package.mk
#include ${LINUX_DIR}/.config
$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS6},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-devel
-post-install:
+iptables-install:
${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc
- ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/
+ ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin
${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib
+iptables-dev-install:
+ ${INSTALL_DIR} ${IDIR_IPTABLES_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_IPTABLES_DEV}/usr/include
+
ip6tables-install:
${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin}
${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin
${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/l2tpns/patches/patch-Makefile b/package/l2tpns/patches/patch-Makefile
index 4d7ca7540..178912dd8 100644
--- a/package/l2tpns/patches/patch-Makefile
+++ b/package/l2tpns/patches/patch-Makefile
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- l2tpns-2.1.21.orig/Makefile 2005-12-07 06:21:37.000000000 +0100
-+++ l2tpns-2.1.21/Makefile 2009-06-13 09:54:41.000000000 +0200
++++ l2tpns-2.1.21/Makefile 2011-02-26 23:05:41.000000000 +0100
@@ -10,18 +10,11 @@ DEFINES =
DEFINES += -DLIBDIR='"$(libdir)"'
DEFINES += -DETCDIR='"$(etcdir)"'
@@ -47,3 +47,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
$(INSTALL) -m 0755 l2tpns $(DESTDIR)$(bindir)/l2tpns
$(INSTALL) -m 0755 nsctl $(DESTDIR)$(bindir)/nsctl
+@@ -77,7 +75,7 @@ install: all
+ $(INSTALL) -m 0644 Docs/l2tpns.8 $(DESTDIR)$(man8dir)/l2tpns.8
+ $(INSTALL) -m 0644 Docs/nsctl.8 $(DESTDIR)$(man8dir)/nsctl.8
+
+- gzip --best --force $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8
++ gzip $(DESTDIR)$(man5dir)/*.5 $(DESTDIR)$(man8dir)/*.8
+
+ @for config in startup-config users ip_pool; \
+ do \
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 092155f91..1c166be50 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -29,6 +29,9 @@ libxfont-install:
${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib
libxfont-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* \
+ ${IDIR_LIBXFONT_DEV}/usr/include
${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig
${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xfont.pc \
${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig
diff --git a/package/libart/patches/100-cross_compile_fix.patch b/package/libart/patches/100-cross_compile_fix.patch
index 90cfda45f..a83e067ad 100644
--- a/package/libart/patches/100-cross_compile_fix.patch
+++ b/package/libart/patches/100-cross_compile_fix.patch
@@ -1,6 +1,6 @@
diff -urN libart.old/Makefile.in libart.dev/Makefile.in
--- libart_lgpl-2.3.17.orig/Makefile.in 2005-01-21 10:52:11.000000000 +0100
-+++ libart_lgpl-2.3.17/Makefile.in 2011-01-15 22:35:19.000000000 +0100
++++ libart_lgpl-2.3.17/Makefile.in 2011-02-26 22:48:38.000000000 +0100
@@ -440,9 +440,9 @@ testuta$(EXEEXT): $(testuta_OBJECTS) $(t
@rm -f testuta$(EXEEXT)
$(LINK) $(testuta_LDFLAGS) $(testuta_OBJECTS) $(testuta_LDADD) $(LIBS)
@@ -9,7 +9,7 @@ diff -urN libart.old/Makefile.in libart.dev/Makefile.in
+gen_art_config$(EXEEXT):
@rm -f gen_art_config$(EXEEXT)
- $(LINK) $(gen_art_config_LDFLAGS) $(gen_art_config_OBJECTS) $(gen_art_config_LDADD) $(LIBS)
-+ $(HOSTCC) -I. -DLIBART_COMPILATION -DHAVE_CONFIG_H -o $@ gen_art_config.c
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -DLIBART_COMPILATION -DHAVE_CONFIG_H -o $@ gen_art_config.c
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index 46be223bc..17173dd5a 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -12,14 +12,23 @@ PKG_SECTION:= libs
PKG_URL:= http://code.google.com/p/libcli
PKG_SITES:= http://libcli.googlecode.com/files/
+PKG_SUBPKGS:= LIBCLI LIBCLI_DEV
+PKGSD_LIBCLI_DEV:= command-line interface headers
+PKGSC_LIBCLI_DEV:= devel
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBCLI,libcli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBCLI_DEV,libcli-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCLI_DEV},${PKGSC_LIBCLI_DEV}))
CONFIG_STYLE:= manual
-post-install:
+libcli-install:
${INSTALL_DIR} ${IDIR_LIBCLI}/usr/lib
${CP} ${WRKINST}/usr/lib/libcli.so* ${IDIR_LIBCLI}/usr/lib
+libcli-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBCLI_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBCLI_DEV}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile
index 83053c10f..992ab4cc1 100644
--- a/package/libmpdclient/Makefile
+++ b/package/libmpdclient/Makefile
@@ -12,13 +12,26 @@ PKG_SECTION:= libs
PKG_URL:= http://mpd.wikia.com/wiki/ClientLib:libmpdclient
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+PKG_SUBPKGS:= LIBMPDCLIENT LIBMPDCLIENT_DEV
+PKGSD_LIBMPDCLIENT_DEV:=headers for interfacing MPD
+PKGSC_LIBMPDCLIENT_DEV:=devel
+
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBMPDCLIENT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMPDCLIENT,libmpdclient,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMPDCLIENT_DEV,libmpdclient-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMPDCLIENT_DEV},${PKGSC_LIBMPDCLIENT_DEV}))
-post-install:
+libmpdclient-install:
$(INSTALL_DIR) $(IDIR_LIBMPDCLIENT)/usr/lib
$(CP) $(WRKINST)/usr/lib/libmpdclient*.so* \
$(IDIR_LIBMPDCLIENT)/usr/lib
+libmpdclient-dev-install:
+ $(INSTALL_DIR) $(IDIR_LIBMPDCLIENT_DEV)/usr/include
+ ${CP} $(WRKINST)/usr/include/* \
+ $(IDIR_LIBMPDCLIENT_DEV)/usr/include
+ $(INSTALL_DIR) $(IDIR_LIBMPDCLIENT_DEV)/usr/lib/pkgconfig
+ $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+ $(IDIR_LIBMPDCLIENT_DEV)/usr/lib/pkgconfig
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
index e0718b49f..f298a3486 100644
--- a/package/libnetfilter_conntrack/Makefile
+++ b/package/libnetfilter_conntrack/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_conntrack
-PKG_VERSION:= 0.0.101
+PKG_VERSION:= 0.9.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3c4b4048c914f2694c3ca6de2bb457dc
+PKG_MD5SUM:= b7506cbb7580433859809d8eac53a199
PKG_DESCR:= API to connection tracking state table
PKG_SECTION:= libs
PKG_DEPENDS:= libnfnetlink
@@ -14,15 +14,26 @@ PKG_BUILDDEP:= libnfnetlink
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_conntrack/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_conntrack/files/
+PKG_SUBPKGS:= LIBNETFILTER_CONNTRACK LIBNETFILTER_CONNTRACK_DEV
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK,libnetfilter-conntrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK_DEV,libnetfilter-conntrack-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+libnetfilter-conntrack-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_conntrack*so* \
- $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib/
+ $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib
+
+libnetfilter-conntrack-dev-install:
+ $(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/include
+ $(CP) $(WRKINST)/usr/include/* \
+ $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/include
+ $(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/lib/pkgconfig
+ ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index dbad956b5..3cffa3e19 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -12,14 +12,24 @@ PKG_SECTION:= libs
PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/
PKG_SITES:= http://www.netfilter.org/projects/libnfnetlink/files/
+PKG_SUBPKGS:= LIBNFNETLINK LIBNFNETLINK_DEV
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNFNETLINK,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNFNETLINK,libnfnetlink,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNFNETLINK_DEV,libnfnetlink-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+libnfnetlink-install:
$(INSTALL_DIR) $(IDIR_LIBNFNETLINK)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libnfnetlink.so* $(IDIR_LIBNFNETLINK)/usr/lib/
+ $(CP) $(WRKINST)/usr/lib/libnfnetlink.so* $(IDIR_LIBNFNETLINK)/usr/lib
+
+libnfnetlink-dev-install:
+ $(INSTALL_DIR) $(IDIR_LIBNFNETLINK_DEV)/usr/include
+ $(CP) $(WRKINST)/usr/include/* $(IDIR_LIBNFNETLINK_DEV)/usr/include
+ $(INSTALL_DIR) $(IDIR_LIBNFNETLINK_DEV)/usr/lib/pkgconfig
+ ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ $(IDIR_LIBNFNETLINK_DEV)/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index c2878f406..3261a50ec 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -32,5 +32,8 @@ libnl-install:
libnl-dev-install:
${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/include
${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNL_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ ${IDIR_LIBNL_DEV}/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 8c3536e0e..e4823c247 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -20,7 +20,7 @@ PKGSC_LIBP11_DEV:= devel
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV}))
post-install:
@@ -30,5 +30,8 @@ post-install:
libp11-dev-install:
${INSTALL_DIR} ${IDIR_LIBP11_DEV}/usr/include
${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBP11_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_LIBP11_DEV}/usr/lib/pkgconfig
+ ${CP} ${WRKINST}/usr/lib/pkgconfig/libp11.pc \
+ ${IDIR_LIBP11_DEV}/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index 728f5b5d1..9030bb0f4 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -25,12 +25,12 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBUSB_COMPAT_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUSB_COMPAT,libusb-compat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUSB_COMPAT_DEV,libusb-compat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS}))
-post-install:
+libusb-compat-install:
${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib
libusb-compat-dev-install:
${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
diff --git a/package/links/Makefile b/package/links/Makefile
index 462d4746b..616c2f211 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-graphics \
+ --with-fb \
--with-ssl \
--without-svgalib \
--without-libtiff \
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 6ad57ae1a..2a83c583a 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= linux-atm
PKG_VERSION:= 2.5.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758
-PKG_DESCR:= ATM library and tools for Linux
+PKG_DESCR:= ATM library for Linux
PKG_SECTION:= libs
PKG_URL:= http://linux-atm.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
@@ -15,7 +15,9 @@ PKG_NOPARALLEL:= 1
PKG_HOST_DEPENDS:= !freebsd
-PKG_SUBPKGS:= LIBATM BR2684CTL
+PKG_SUBPKGS:= LIBATM LIBATM_DEV BR2684CTL
+PKGSD_LIBATM_DEV:= ATM headers for Linux
+PKGSC_LIBATM_DEV:= devel
PKGSD_BR2684CTL:= br2684ctl ATM utility
PKGSS_BR2684CTL:= libatm
PKGSC_BR2684CTL:= route
@@ -25,11 +27,18 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBATM_DEV,libatm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBATM_DEV},${PKGSC_LIBATM_DEV}))
$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BR2684CTL},${PKGSD_BR2684CTL},${PKGSC_BR2684CTL}))
-post-install:
+libatm-install:
${INSTALL_DIR} ${IDIR_LIBATM}/usr/lib
${CP} ${WRKINST}/usr/lib/libatm.so* ${IDIR_LIBATM}/usr/lib
+
+libatm-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBATM_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBATM_DEV}/usr/include
+
+br2684ctl-install:
${INSTALL_DIR} ${IDIR_BR2684CTL}/usr/sbin
${CP} ${WRKINST}/usr/sbin/br2684ctl ${IDIR_BR2684CTL}/usr/sbin
diff --git a/package/neon/Makefile b/package/neon/Makefile
index 39f77a483..6ef4685e5 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -32,11 +32,14 @@ neon-install:
$(CP) ${WRKINST}/usr/lib/libneon.so* ${IDIR_NEON}/usr/lib
neon-dev-install:
- ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/lib/pkgconfig
${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/include/neon
${INSTALL_DATA} ${WRKINST}/usr/include/neon/*.h \
${IDIR_NEON_DEV}/usr/include/neon
+ ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/lib/pkgconfig
${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/neon.pc \
${IDIR_NEON_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/neon-config \
+ ${IDIR_NEON_DEV}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index 277be34b7..742f299cb 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -42,11 +42,14 @@ CONFIGURE_ARGS+= --disable-esd \
--disable-video-opengl \
--with-x
-post-install:
+libsdl-install:
$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
libsdl-dev-install:
+ $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/sdl-config \
+ $(IDIR_LIBSDL_DEV)/usr/bin
$(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL
$(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL