Simplify configure and add target optimizations,

[openwrt.git] / openwrt / package / libgd / Makefile

diff --git a/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile
index eaa45fc..c180dd8 100644 (file)
--- a/openwrt/package/libgd/Makefile
+++ b/openwrt/package/libgd/Makefile
@@ -18,7 +18,6 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGD,libgd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBGD,libgd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-

 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \


@@ -54,13 +53,15 @@ $(PKG_BUILD_DIR)/.configured:
                  --without-x \
                  --with-png=$(STAGING_DIR)/usr \
        )
                  --without-x \
                  --with-png=$(STAGING_DIR)/usr \
        )

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built:
 
 $(PKG_BUILD_DIR)/.built:

+       rm -rf $(PKG_INSTALL_DIR)

        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install

+       touch $@

 
 $(IPKG_LIBGD):
        install -d -m0755 $(IDIR_LIBGD)/usr/lib
 
 $(IPKG_LIBGD):
        install -d -m0755 $(IDIR_LIBGD)/usr/lib


@@ -76,14 +77,16 @@ $(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.built
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/

+       touch $@

 
 install-dev: $(STAGING_DIR)/usr/lib/libgd.so
 
 uninstall-dev:
        rm -rf \
 
 install-dev: $(STAGING_DIR)/usr/lib/libgd.so
 
 uninstall-dev:
        rm -rf \

-         $(STAGING_DIR)/usr/include/entities.h \
-         $(STAGING_DIR)/usr/include/gd*.h \
-         $(STAGING_DIR)/usr/lib/libgd.{a,so*}
+               $(STAGING_DIR)/usr/bin/gdlib-config \
+               $(STAGING_DIR)/usr/include/entities.h \
+               $(STAGING_DIR)/usr/include/gd*.h \
+               $(STAGING_DIR)/usr/lib/libgd.{a,so*} \

 
 compile: install-dev
 clean: uninstall-dev
 
 compile: install-dev
 clean: uninstall-dev