Changeset 2388


Ignore:
Timestamp:
2005-11-07T19:26:35+01:00 (11 years ago)
Author:
nbd
Message:

change bool in BR2_COMPILE_* to tristate to avoid unnecessary package/<foo>-install calls

Location:
trunk/openwrt/package
Files:
51 edited
4 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/Config.in

    r2362 r2388  
    172172source "package/jpeg/Config.in"  # libjpeg 
    173173source "package/libtool/Config.in"  # libltdl 
    174 source "package/lzo/Config.in"  # liblzo 
     174source "package/liblzo/Config.in" 
    175175source "package/libmad/Config.in" 
    176176source "package/matrixssl/Config.in"  # libmatrixssl 
  • trunk/openwrt/package/Makefile

    r2362 r2388  
    8484package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error 
    8585package-$(BR2_PACKAGE_LIBID3TAG) += libid3tag 
     86package-$(BR2_PACKAGE_LIBLZO) += liblzo 
    8687package-$(BR2_PACKAGE_LIBMAD) += libmad 
    8788package-$(BR2_PACKAGE_LIBNET) += libnet 
     
    103104package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm 
    104105package-$(BR2_COMPILE_LUA) += lua 
    105 package-$(BR2_COMPILE_LZO) += lzo 
    106106package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools 
    107107package-$(BR2_PACKAGE_MARADNS) += maradns 
     
    213213package-$(BR2_PACKAGE_ZLIB) += zlib 
    214214 
    215 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 
     215DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo 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 
    216216DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS)) 
    217217SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp 
     
    298298sqlite2-compile: ncurses-compile readline-compile 
    299299tcpdump-compile: libpcap-compile 
    300 tinc-compile: zlib-compile openssl-compile lzo-compile 
     300tinc-compile: zlib-compile openssl-compile liblzo-compile 
    301301tor-compile: libevent-compile openssl-compile zlib-compile 
    302302usbutils-compile: libusb-compile 
    303 vtun-compile: zlib-compile openssl-compile lzo-compile 
     303vtun-compile: zlib-compile openssl-compile liblzo-compile 
    304304wificonf-compile: wireless-tools-compile nvram-compile 
    305305wknock-compile: libpcap-compile 
     
    348348openvpn-compile: openssl-compile 
    349349ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) 
    350 openvpn-compile: lzo-compile 
     350openvpn-compile: liblzo-compile 
    351351endif 
    352352 
  • trunk/openwrt/package/atftp/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_ATFTP 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD 
  • trunk/openwrt/package/avahi/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_AVAHI 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_AVAHI_DAEMON || BR2_PACKAGE_AVAHI_DNSCONFD || BR2_PACKAGE_LIBAVAHI 
  • trunk/openwrt/package/bind/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_BIND 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER 
  • trunk/openwrt/package/curl/Config.in

    r2333 r2388  
    11config BR2_COMPILE_CURL 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBCURL 
  • trunk/openwrt/package/cyrus-sasl/Config.in

    r2333 r2388  
    11config BR2_COMPILE_CYRUS_SASL 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBSASL2 
  • trunk/openwrt/package/dhcp/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_DHCP 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_DHCP_RELAY || BR2_PACKAGE_DHCP_SERVER 
  • trunk/openwrt/package/expat/Config.in

    r2333 r2388  
    11config BR2_COMPILE_EXPAT 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBEXPAT 
  • trunk/openwrt/package/flac/Config.in

    r2333 r2388  
    11config BR2_COMPILE_FLAC 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBFLAC 
  • trunk/openwrt/package/fuse/Config.in

    r2333 r2388  
    11config BR2_COMPILE_FUSE 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBFUSE 
  • trunk/openwrt/package/glib/Config.in

    r2333 r2388  
    11config BR2_COMPILE_GLIB 
    2         bool 
     2        tristate 
    33        depends BR2_PACKAGE_GLIB1 
    44 
  • trunk/openwrt/package/gmp/Config.in

    r2333 r2388  
    11config BR2_COMPILE_GMP 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBGMP 
  • trunk/openwrt/package/gnutls/Config.in

    r2333 r2388  
    11config BR2_COMPILE_GNUTLS 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBGNUTLS 
  • trunk/openwrt/package/howl/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_HOWL 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_LIBHOWL 
  • trunk/openwrt/package/iproute2/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_IPROUTE2 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC 
  • trunk/openwrt/package/jpeg/Config.in

    r2333 r2388  
    11config BR2_COMPILE_JPEG 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBJPEG 
  • trunk/openwrt/package/kismet/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_KISMET 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_KISMET_CLIENT || BR2_PACKAGE_KISMET_DRONE || BR2_PACKAGE_KISMET_SERVER 
  • trunk/openwrt/package/libdb/Config.in

    r2333 r2388  
    11config BR2_COMPILE_DB 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBDB 
  • trunk/openwrt/package/liblzo/Config.in

    r2387 r2388  
    1 config BR2_COMPILE_LZO 
    2         bool 
    3         default n 
    4         depends BR2_PACKAGE_LIBLZO 
    5  
    61config BR2_PACKAGE_LIBLZO 
    72        prompt "liblzo............................ Real-time data compression library" 
    83        tristate 
    94        default m if CONFIG_DEVEL 
    10         select BR2_COMPILE_LZO 
    115        help 
    126          A real-time data compression library 
  • trunk/openwrt/package/libtool/Config.in

    r2333 r2388  
    11config BR2_COMPILE_LIBTOOL 
    2         bool 
     2        tristate 
    33        depends BR2_PACKAGE_LIBLTDL 
    44 
  • trunk/openwrt/package/lua/Config.in

    r2340 r2388  
    22 
    33config BR2_COMPILE_LUA 
    4         bool 
     4        tristate 
    55        default y 
    66        depends BR2_PACKAGE_LIBLUA 
  • trunk/openwrt/package/matrixssl/Config.in

    r2333 r2388  
    11config BR2_COMPILE_MATRIXSSL 
    2         bool 
     2        tristate 
    33        depends BR2_PACKAGE_LIBMATRIXSSL 
    44 
  • trunk/openwrt/package/mini_httpd/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_MINI_HTTPD 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_MINI_HTTPD || BR2_PACKAGE_MINI_HTTPD_MATRIXSSL || BR2_PACKAGE_MINI_HTTPD_OPENSSL 
  • trunk/openwrt/package/miredo/Config.in

    r2333 r2388  
    11config BR2_COMPILE_MIREDO 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_MIREDO || BR2_PACKAGE_MIREDO_SERVER 
  • trunk/openwrt/package/monit/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_MONIT 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_MONIT || BR2_PACKAGE_MONIT_NOSSL 
  • trunk/openwrt/package/mysql/Config.in

    r2333 r2388  
    11config BR2_COMPILE_MYSQL 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBMYSQLCLIENT 
  • trunk/openwrt/package/ncurses/Config.in

    r2333 r2388  
    11config BR2_COMPILE_NCURSES 
    2         bool 
     2        tristate 
    33        depends BR2_PACKAGE_LIBNCURSES 
    44 
  • trunk/openwrt/package/ndisc/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_NDISC6 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_NDISC6 || BR2_PACKAGE_RDISC6 || BR2_PACKAGE_TCPTRACEROUTE6 
  • trunk/openwrt/package/net-snmp/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_NET_SNMP 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_LIBNETSNMP || BR2_PACKAGE_SNMPD_STATIC 
  • trunk/openwrt/package/opencdk/Config.in

    r2333 r2388  
    11config BR2_PACKAGE_OPENCDK 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBOPENCDK 
  • trunk/openwrt/package/openldap/Config.in

    r2345 r2388  
    11config BR2_COMPILE_OPENLDAP 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBOPENLDAP 
  • trunk/openwrt/package/openssh/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_OPENSSH 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_OPENSSH_CLIENT || BR2_PACKAGE_OPENSSH_SERVER || BR2_PACKAGE_OPENSSH_SFTP_CLIENT || BR2_PACKAGE_OPENSSH_SFTP_SERVER 
  • trunk/openwrt/package/openssl/Config.in

    r2344 r2388  
    11config BR2_COMPILE_OPENSSL 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBOPENSSL 
  • trunk/openwrt/package/osiris/Config.in

    r2333 r2388  
    11config BR2_COMPILE_OSIRIS 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_OSIRISD 
  • trunk/openwrt/package/pcre/Config.in

    r2333 r2388  
    11config BR2_COMPILE_PCRE 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBPCRE 
  • trunk/openwrt/package/php4/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_PHP4 
    4         bool 
     4        tristate 
    55        default y 
    66        depends BR2_PACKAGE_PHP4_CLI || BR2_PACKAGE_PHP4_CGI || BR2_PACKAGE_PHP4_FASTCGI 
  • trunk/openwrt/package/php5/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_PHP5 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_PHP5_CLI || BR2_PACKAGE_PHP5_CGI || BR2_PACKAGE_PHP5_FASTCGI 
  • trunk/openwrt/package/popt/Config.in

    r2333 r2388  
    11config BR2_COMPILE_POPT 
    2         bool 
     2        tristate 
    33        depends BR2_PACKAGE_LIBPOPT 
    44 
  • trunk/openwrt/package/postgresql/Config.in

    r2346 r2388  
    11config BR2_COMPILE_POSTGRESQL 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBPQ 
  • trunk/openwrt/package/readline/Config.in

    r2333 r2388  
    11config BR2_COMPILE_READLINE 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBREADLINE 
  • trunk/openwrt/package/rp-pppoe/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_RP_PPPOE 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_PPPOE_CLIENT || BR2_PACKAGE_PPPOE_RELAY || BR2_PACKAGE_PPPOE_SERVER || BR2_PACKAGE_PPPOE_SNIFF 
  • trunk/openwrt/package/rrdtool1/Config.in

    r2333 r2388  
    11config BR2_COMPILE_RRDTOOL1 
    22        prompt "rrdtool1.......................... Round Robin Database (RRD) tools (v1.0.x)" 
    3         bool 
    4         default y 
     3        tristate 
     4        default m if CONFIG_DEVEL 
    55 
    66config BR2_PACKAGE_LIBRRD1 
     
    5454        prompt   "rrdtool1........................ Round Robin Database (RRD) management tools (v1.0.x)" 
    5555        tristate 
     56        default m if CONFIG_DEVEL 
    5657        depends BR2_COMPILE_RRDTOOL1 
    5758        select BR2_PACKAGE_LIBRRD1 
  • trunk/openwrt/package/rrs/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_RRS 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_RRS || BR2_PACKAGE_RRS_NOSSL 
  • trunk/openwrt/package/sablevm-classpath/Config.in

    r2333 r2388  
    11config BR2_COMPILE_SABLEVM_CLASSPATH 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH 
  • trunk/openwrt/package/samba/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_SAMBA 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_SAMBA || BR2_PACKAGE_SAMBA_CLIENT || BR2_PACKAGE_SMBFS 
  • trunk/openwrt/package/shfs/Config.in

    r2333 r2388  
    11config BR2_COMPILE_SHFS 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_SHFS_UTILS 
  • trunk/openwrt/package/speex/Config.in

    r2333 r2388  
    11config BR2_COMPILE_SPEEX 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBSPEEX 
  • trunk/openwrt/package/sqlite/Config.in

    r2333 r2388  
    11config BR2_COMPILE_SQLITE 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBSQLITE 
  • trunk/openwrt/package/sqlite2/Config.in

    r2333 r2388  
    11config BR2_COMPILE_SQLITE2 
    2         bool 
     2        tristate 
    33        default n 
    44        depends BR2_PACKAGE_LIBSQLITE2 
  • trunk/openwrt/package/usbutils/Config.in

    r2333 r2388  
    11config BR2_COMPILE_USBUTILS 
    2         bool 
     2        tristate 
    33        depends BR2_PACKAGE_LSUSB 
    44 
  • trunk/openwrt/package/util-linux/Config.in

    r2333 r2388  
    22 
    33config BR2_COMPILE_UTIL_LINUX 
    4         bool 
     4        tristate 
    55        default n 
    66        depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS 
Note: See TracChangeset for help on using the changeset viewer.