enable jpeg support, add dependency on libpng, standardize.

[openwrt.git] / package / mtr / Makefile

diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index 97b3cf2..f088562 100644 (file)
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtr
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtr


@@ -15,8 +17,15 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,MTR,mtr,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,MTR,mtr,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); \
+$(PKG_BUILD_DIR)/.configured:
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+               touch configure.in; \
+               touch aclocal.m4; \
+               touch Makefile.in; \
+               touch img/Makefile.in; \
+               touch stamp-h.in; \
+               touch config.h.in; \
+               touch configure; \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \


@@ -59,7 +68,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_MTR):
        install -d -m0755 $(IDIR_MTR)/usr/sbin
 
 $(IPKG_MTR):
        install -d -m0755 $(IDIR_MTR)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/

        $(RSTRIP) $(IDIR_MTR)
        $(IPKG_BUILD) $(IDIR_MTR) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_MTR)
        $(IPKG_BUILD) $(IDIR_MTR) $(PACKAGE_DIR)