disable support for things we don't have (yet) explicitly (fix #3)

[openwrt.git] / openwrt / package / Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 91307cd..0a5f00f 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -109,6 +109,7 @@ package-$(BR2_PACKAGE_MICROCOM) += microcom
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
 package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
 package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail

+package-$(BR2_COMPILE_MIREDO) += miredo

 package-$(BR2_COMPILE_MONIT) += monit
 package-$(BR2_PACKAGE_MPD) += mpd
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
 package-$(BR2_COMPILE_MONIT) += monit
 package-$(BR2_PACKAGE_MPD) += mpd
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd


@@ -206,7 +207,7 @@ package-$(BR2_PACKAGE_XINETD) += xinetd
 package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
 package-$(BR2_PACKAGE_ZLIB) += zlib
 
 package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
 package-$(BR2_PACKAGE_ZLIB) += zlib
 

-DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt
+DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib

 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
 SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp
 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
 SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp
 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))


@@ -253,6 +254,7 @@ libvorbis-compile: libogg-compile
 libxml2-compile: zlib-compile
 libxslt-compile: libxml2-compile
 lighttpd-compile: openssl-compile pcre-compile
 libxml2-compile: zlib-compile
 libxslt-compile: libxml2-compile
 lighttpd-compile: openssl-compile pcre-compile

+miredo-compile: uclibc++-compile

 mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
 mtr-compile: ncurses-compile
 mysql-compile: ncurses-compile zlib-compile
 mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
 mtr-compile: ncurses-compile
 mysql-compile: ncurses-compile zlib-compile


@@ -442,29 +444,42 @@ $(TARGET_DIR):
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
        @[ -f $(STAMP_DIR)/.$@ ] || { \
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
        @[ -f $(STAMP_DIR)/.$@ ] || { \

-               $(TRACE) package/$(patsubst %-prepare,%,$@)/prepare; \
-               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+               $(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
+               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
+                       touch $(STAMP_DIR)/.$@; \
+                       $(CMD_TRACE) " done"; \
+                       $(END_TRACE); \
+               } \

        }
        }

-       @touch $(STAMP_DIR)/.$@

 
 

-%-compile: %-prepare 
+%-compile:

        @[ -f $(STAMP_DIR)/.$@ ] || { \
        @[ -f $(STAMP_DIR)/.$@ ] || { \

-               $(TRACE) package/$(patsubst %-compile,%,$@)/compile; \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+               $(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \
+               $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
+                       touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
+                       touch $(STAMP_DIR)/.$@; \
+                       $(CMD_TRACE) " done"; \
+                       $(END_TRACE); \
+               } \

        }
        }

-       @touch $(STAMP_DIR)/.$@

 
 %-install: %-compile
 
 %-install: %-compile

-       @$(TRACE) package/$(patsubst %-install,%,$@)/install
+       @$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: "

        @$(MAKE) -C $(patsubst %-install,%,$@) install
        @$(MAKE) -C $(patsubst %-install,%,$@) install

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)

 
 %-rebuild: 
 
 %-rebuild: 

-       @$(TRACE) package/$(patsubst %-rebuild,%,$@)/rebuild
+       @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: "

        @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
        @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)

 
 %-clean:
 
 %-clean:

-       @$(TRACE) package/$(patsubst %-clean,%,$@)/clean
+       @$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: "

        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
        @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
        @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*

+       @$(CMD_TRACE) " done"
+       @$(END_TRACE)