fix serdisplib build, add Id tag

SVN-Revision: 2935

diff --git a/openwrt/package/serdisplib/Config.in b/openwrt/package/serdisplib/Config.in
index 4841cc3e8634cd7badb5cee3a81c771c8ad4a125..c5181a5c57ccc98c07a051f18306e0c25e54b5a0 100644 (file)
--- a/openwrt/package/serdisplib/Config.in
+++ b/openwrt/package/serdisplib/Config.in
@@ -3,5 +3,8 @@ config BR2_PACKAGE_SERDISPLIB
        tristate
        default m if CONFIG_DEVEL
        help
-               serdisplib is a library to drive serial and parallel displays
-               with built-in controllers.
+         serdisplib is a library to drive serial and parallel displays
+         with built-in controllers.
+         
+         http://serdisplib.sourceforge.net/
+

diff --git a/openwrt/package/serdisplib/Makefile b/openwrt/package/serdisplib/Makefile
index 2c16775f91cc5a6843f44d5c5387bdc109447c9f..435b340c9312e136c4b7b3fbe6a918064d19b911 100644 (file)
--- a/openwrt/package/serdisplib/Makefile
+++ b/openwrt/package/serdisplib/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=serdisplib
@@ -5,11 +7,11 @@ PKG_VERSION:=1.96
 PKG_RELEASE:=1
 PKG_MD5SUM:=b074e02d8d63f34cba8ec45c23f63f78
 
-PKG_SOURCE_URL:=http://dl.sourceforge.net/sourceforge/serdisplib
+PKG_SOURCE_URL:=@SF/serdisplib
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
@@ -21,35 +23,60 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               ac_cv_func_malloc_0_nonnull=yes \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
                        --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
                        --prefix=/usr \
-                       --without-libiconv-prefix \
-                       --without-libintl-prefix \
-                       --disable-nls \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --enable-shared \
+                       --disable-static \
+                       --with-gnu-ld \
        );
        touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)/usr/bin
-       mkdir -p $(PKG_INSTALL_DIR)/usr/lib
-       $(MAKE) -C $(PKG_BUILD_DIR)/src \
-               prefix="$(PKG_INSTALL_DIR)/usr"
-       cp -fpR $(PKG_BUILD_DIR)/src/testserdisp $(PKG_INSTALL_DIR)/usr/bin
-       cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.so* $(PKG_INSTALL_DIR)/usr/lib
+       $(MAKE) -C $(PKG_BUILD_DIR) all
        touch $@
 
 $(IPKG_SERDISPLIB):
-       install -d -m0755 $(IDIR_SERDISPLIB)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/testserdisp $(IDIR_SERDISPLIB)/usr/bin
        install -d -m0755 $(IDIR_SERDISPLIB)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libserdisp.so* $(IDIR_SERDISPLIB)/usr/lib
+       cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(IDIR_SERDISPLIB)/usr/lib
        $(RSTRIP) $(IDIR_SERDISPLIB)
        $(IPKG_BUILD) $(IDIR_SERDISPLIB) $(PACKAGE_DIR)
 
+$(STAGING_DIR)/usr/lib/libserdisp.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/usr/include
+       cp -fpR $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/
+       touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libserdisp.so
+
+uninstall-dev:
+       rm -rf \
+               $(STAGING_DIR)/usr/include/serdisplib \
+               $(STAGING_DIR)/usr/lib/libserdisp.{a,so*} \
+
+compile-targets: install-dev
+clean-targets: uninstall-dev
+
 mostlyclean:
-       make -C $(PKG_BUILD_DIR) clean
-       rm $(PKG_BUILD_DIR)/.built
+       $(MAKE) -C $(PKG_BUILD_DIR) clean
+       rm -f $(PKG_BUILD_DIR)/.built