X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fserdisplib%2FMakefile;h=bcd693ad6e3a5ab37840039d64c35945265987ce;hb=2d80e18c40060e989e53e49786e91bd3ce4b32ea;hp=5a4ac3e03da0b648f24bd357453611bacf658a29;hpb=e3c48b8191b7d7a3d89202275a106911e912512c;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile
index 5a4ac3e03d..bcd693ad6e 100644
--- a/libs/serdisplib/Makefile
+++ b/libs/serdisplib/Makefile
@@ -1,22 +1,19 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=serdisplib
-PKG_VERSION:=1.96
+PKG_VERSION:=1.97.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/serdisplib
-PKG_MD5SUM:=b074e02d8d63f34cba8ec45c23f63f78
-PKG_CAT:=zcat
+PKG_MD5SUM:=2aa91c43d01d2dfc9fbc1116e3063ae1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,65 +21,37 @@ define Package/serdisplib
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A display control library
-  DESCRIPTION:=A display control library.\\\
-    serdisplib is a library to drive serial and parallel displays \\\
-    with built-in controllers.
+  DEPENDS:=@!LINUX_2_4
   URL:=http://serdisplib.sourceforge.net/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		$(TARGET_CONFIGURE_OPTS) \
-		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 \
-			--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 \
-	);
+define Package/serdisplib/description
+	serdisplib is a library to drive serial and parallel displays 
+	with built-in controllers.
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-endef
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--enable-static \
 
-define Package/serdisplib/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-implicit -I../include -I.." \
+		all
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/include/serdisplib $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/serdisplib \
-		$(STAGING_DIR)/usr/lib/libserdisp.{a,so*}
+define Package/serdisplib/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,serdisplib))