libtwin: General cleanup of the libtwin package makefile

 o Make indenting consistent.
 o Update project URL.
 o Add MAINTAINER.
 o Use EXTRA_CFLAGS instead of TARGET_CFLAGS.
 o Use INSTALL_XXX macros.
 o Use default Build/Configure and Build/Compile targets.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
SVN-Revision: 17323

diff --git a/libs/libtwin/Makefile b/libs/libtwin/Makefile
index 63a8068dd22d3369f9d127b49193f1bb6cacc31a..d58dfdbb4781b14e8d9aebcdf2e883a6f7e1ab43 100644 (file)
--- a/libs/libtwin/Makefile
+++ b/libs/libtwin/Makefile
@@ -18,49 +18,51 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+PKG_INSTALL=1
+

 define Package/libtwin
 define Package/libtwin

-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib +libpng +libjpeg
-  TITLE:=The tiny windowing system libraries
-  URL:=http://www.t2-project.org/packages/libtwin.html
+       SECTION:=libs
+       CATEGORY:=Libraries
+       DEPENDS:=+zlib +libpng +libjpeg
+       TITLE:=The tiny windowing system library
+       URL:=http://ozlabs.org/~jk/projects/petitboot/
+       MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com>

 endef
 
 endef
 

-TARGET_CFLAGS += -flax-vector-conversions
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --disable-x11 \
-       )
+define Package/libtwin/description
+       Keith Packard's Tiny Windowing System Library

 endef
 
 endef
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+CONFIGURE_ARGS += --enable-shared --enable-static --disable-x11
+
+EXTRA_CFLAGS += -flax-vector-conversions

 
 define Build/InstallDev
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libtwin $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtwin.{la,a,so*} $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtwin.pc $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DIR) $(1)/usr/include/libtwin
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/libtwin/*.h \
+               $(1)/usr/include/libtwin
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/lib/libtwin.{la,a,so*} \
+               $(1)/usr/lib/
+
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtwin.pc \
+               $(1)/usr/lib/pkgconfig/

 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf \
-               $(STAGING_DIR)/usr/include/libtwin \
-               $(STAGING_DIR)/usr/lib/libtwin.{la,a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/libtwin.pc
+       rm -rf $(1)/usr/include/libtwin

 endef
 
 define Package/libtwin/install
        $(INSTALL_DIR) $(1)/usr/lib
 endef
 
 define Package/libtwin/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtwin.so* $(1)/usr/lib/
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/lib/libtwin.so* \
+               $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,libtwin))
 endef
 
 $(eval $(call BuildPackage,libtwin))