clean up some packages

SVN-Revision: 12513

diff --git a/lang/gst-python/Makefile b/lang/gst-python/Makefile
index fc47dc7ff81a5983b4f54721c74d50a158a91378..5a840ae03bd9ab165c5fc4f35875184820f09fbb 100644 (file)
--- a/lang/gst-python/Makefile
+++ b/lang/gst-python/Makefile
@@ -17,8 +17,17 @@ PKG_MD5SUM:=2c633a06c140024dd0d59db1e87e6945
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+PKG_INSTALL=1
+
+TARGET_CFLAGS += $(FPIC) \
+       -I$(STAGING_DIR)/usr/lib/libintl/include \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include
+
+TARGET_LDFLAGS += \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+
+CONFIGURE_VARS += PYTHON=/usr/bin/python
 
 define Package/gst-python
   SUBMENU:=Python
@@ -33,22 +42,6 @@ define Package/gst-python/description
   python bindings for dbus 
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       PYTHON=/usr/bin/python \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
-endef
-
 define Build/InstallDev
        mkdir -p $(1)
        cp -r $(PKG_INSTALL_DIR)/* $(1)

diff --git a/lang/python-dbus/Makefile b/lang/python-dbus/Makefile
index 733180cc6d0aeff194be5a5fac70bd0344dd94fe..d93f147ba338697f82e973b65b495033c47d751a 100644 (file)
--- a/lang/python-dbus/Makefile
+++ b/lang/python-dbus/Makefile
@@ -16,8 +16,13 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+EXTRA_CFLAGS += \
+       -I$(STAGING_DIR)/usr/lib/libintl/include \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include
+
+EXTRA_LDFLAGS += \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/dbus-python
   SUBMENU:=Python

diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile
index 6ee2da166d40c94b051e0c6aeebe8dfab71fc838..3b7c73cce6ea4ec360e666b4dfa3f0c687dedc94 100644 (file)
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -16,8 +16,13 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+EXTRA_CFLAGS += \
+       -I$(STAGING_DIR)/usr/lib/libintl/include \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include
+
+EXTRA_LDFLAGS += \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/gnome-python-desktop
   SUBMENU:=Python

diff --git a/libs/check/Makefile b/libs/check/Makefile
index 22ac2966c445435a98fa391862b4fb0c4ca14318..1dc0b5c30538fc80a341f4637e33406689f7d9c1 100644 (file)
--- a/libs/check/Makefile
+++ b/libs/check/Makefile
@@ -16,8 +16,15 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/ -fPIC
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+PKG_INSTALL = 1
+
+TARGET_CFLAGS += $(FPIC) \
+       -I$(STAGING_DIR)/usr/lib/libintl/include \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include
+
+TARGET_LDFLAGS += \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/check
   SECTION:=lib
@@ -28,7 +35,7 @@ define Package/check
 endef
 
 define Package/check/description
-  unit testinglibrary
+  unit testing library
 endef
 
 define Build/Configure
@@ -36,10 +43,8 @@ define Build/Configure
        $(call Build/Configure/Default)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-       cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
+define Build/Install
+       $(call Build/Install/Default)
        cd $(PKG_INSTALL_DIR)/usr/lib/ ; ln -s libcheck.so libcheck_pic.so
 endef
 

diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index b481e6d11c06e883acb759f6cbdb732aba22ad45..6e6ef67f012a7f63d003258fb80b7d8b43a66920 100644 (file)
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -34,10 +34,7 @@ define Package/ssmtp/description
  configuration.
 endef
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-TARGET_CONFIGURE_OPTS+=\
+TARGET_CONFIGURE_OPTS += \
        CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)"
 
 CONFIGURE_ARGS += \