diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-11-13 17:15:01 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-11-13 17:15:01 +0000 |
| commit | 6527e7bb4427d9afe9ebc1aef1e57ffbc96fb7d0 (patch) | |
| tree | c26ba10aef2d264150d0a2b0857540679691babe /rules | |
| parent | 60aafdcb45aec21c1aa81947e5c45302daf827e1 (diff) | |
| download | ptxdist-6527e7bb4427d9afe9ebc1aef1e57ffbc96fb7d0.tar.gz ptxdist-6527e7bb4427d9afe9ebc1aef1e57ffbc96fb7d0.tar.xz | |
add packages to PACKAGES-y
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3340 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
227 files changed, 242 insertions, 672 deletions
diff --git a/rules/apache.make b/rules/apache.make index 7b7b88935..25b10e356 100644 --- a/rules/apache.make +++ b/rules/apache.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_APACHE -PACKAGES += apache -endif +PACKAGES-$(PTXCONF_APACHE) += apache # # Paths and names diff --git a/rules/apache2.make b/rules/apache2.make index b62911d3b..c418f00ea 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_APACHE2 -PACKAGES += apache2 -endif +PACKAGES-$(PTXCONF_APACHE2) += apache2 # # Paths and names diff --git a/rules/at-spi.make b/rules/at-spi.make index 25324d11e..3bb48c1fc 100644 --- a/rules/at-spi.make +++ b/rules/at-spi.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_AT-SPI -PACKAGES += at-spi -endif +PACKAGES-$(PTXCONF_AT-SPI) += at-spi # # Paths and names diff --git a/rules/atk124.make b/rules/atk124.make index 243f67002..1f72dd70a 100644 --- a/rules/atk124.make +++ b/rules/atk124.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_ATK -PACKAGES += atk -endif +PACKAGES-$(PTXCONF_ATK) += atk # # Paths and names diff --git a/rules/autoconf-2.13.make b/rules/autoconf-2.13.make index 9e61487a4..ae144a489 100644 --- a/rules/autoconf-2.13.make +++ b/rules/autoconf-2.13.make @@ -13,7 +13,7 @@ # # We provide this package # -#PACKAGES += autoconf213 +#PACKAGES-$() += autoconf213 # # Paths and names diff --git a/rules/bash.make b/rules/bash.make index b60c1dd11..cba2f2da8 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_BASH -PACKAGES += bash -endif +PACKAGES-$(PTXCONF_BASH) += bash # # Paths and names diff --git a/rules/betaftpd.make b/rules/betaftpd.make index 913affcaf..5f5be5e05 100644 --- a/rules/betaftpd.make +++ b/rules/betaftpd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_BETAFTPD -PACKAGES += betaftpd -endif +PACKAGES-$(PTXCONF_BETAFTPD) += betaftpd # # Paths and names diff --git a/rules/bind.make b/rules/bind.make index aac142dd8..8006665fe 100644 --- a/rules/bind.make +++ b/rules/bind.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_BIND -PACKAGES += bind -endif +PACKAGES-$(PTXCONF_BIND) += bind # # Paths and names diff --git a/rules/bing.make b/rules/bing.make index eb693b401..2567be4ba 100644 --- a/rules/bing.make +++ b/rules/bing.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_BING -PACKAGES += bing -endif +PACKAGES-$(PTXCONF_BING) += bing # # Paths and names diff --git a/rules/binutils.make b/rules/binutils.make index bd40215f5..b795fb3f5 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -10,9 +10,7 @@ # FIXME: RSC: this packet installs only libbfd; check what else we would need -ifdef PTXCONF_LIBBFD -PACKAGES += binutils -endif +PACKAGES-$(PTXCONF_LIBBFD) += binutils # # Paths and names diff --git a/rules/blackbox.make b/rules/blackbox.make index 0d67ff38e..e6b1574d0 100644 --- a/rules/blackbox.make +++ b/rules/blackbox.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_BLACKBOX -PACKAGES += blackbox -endif +PACKAGES-$(PTXCONF_BLACKBOX) += blackbox # # Paths and names diff --git a/rules/bonniexx.make b/rules/bonniexx.make index d2bf6ba2d..3ec9bb937 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_BONNIEXX -PACKAGES += bonniexx -endif +PACKAGES-$(PTXCONF_BONNIEXX) += bonniexx # # Paths and names diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make index ee07360ae..d397975fb 100644 --- a/rules/bridge-utils.make +++ b/rules/bridge-utils.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_BRIDGE_UTILS -PACKAGES += bridge-utils -endif +PACKAGES-$(PTXCONF_BRIDGE_UTILS) += bridge-utils # # Paths and names diff --git a/rules/busybox.make b/rules/busybox.make index ec7cc2f70..fb48dac2b 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_BUSYBOX -PACKAGES += busybox -endif +PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names diff --git a/rules/canutils.make b/rules/canutils.make index 7b3e50a67..a619b1909 100644 --- a/rules/canutils.make +++ b/rules/canutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CANUTILS -PACKAGES += canutils -endif +PACKAGES-$(PTXCONF_CANUTILS) += canutils # # Paths and names diff --git a/rules/cfgsh.make b/rules/cfgsh.make index e0b1094be..ac3361166 100644 --- a/rules/cfgsh.make +++ b/rules/cfgsh.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CFGSH -PACKAGES += cfgsh -endif +PACKAGES-$(PTXCONF_CFGSH) += cfgsh # # Paths and names diff --git a/rules/chrony.make b/rules/chrony.make index 85d9a3360..8e4f2553e 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CHRONY -PACKAGES += chrony -endif +PACKAGES-$(PTXCONF_CHRONY) += chrony # # Paths and names diff --git a/rules/clementine.make b/rules/clementine.make index 2ecdd173f..74a856744 100644 --- a/rules/clementine.make +++ b/rules/clementine.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CLEMENTINE -PACKAGES += clementine -endif +PACKAGES-$(PTXCONF_CLEMENTINE) += clementine # # Paths and names diff --git a/rules/clock.make b/rules/clock.make index 0c81e4e26..e31c2785c 100644 --- a/rules/clock.make +++ b/rules/clock.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CLOCK -PACKAGES += clock -endif +PACKAGES-$(PTXCONF_CLOCK) += clock # # Paths and names diff --git a/rules/coreutils.make b/rules/coreutils.make index ea66f58ee..ee845a08a 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_COREUTILS -PACKAGES += coreutils -endif +PACKAGES-$(PTXCONF_COREUTILS) += coreutils # # Paths and names diff --git a/rules/cppunit.make b/rules/cppunit.make index 5fdf5824a..bf283d2e3 100644 --- a/rules/cppunit.make +++ b/rules/cppunit.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CPPUNIT -PACKAGES += cppunit -endif +PACKAGES-$(PTXCONF_CPPUNIT) += cppunit # # Paths and names diff --git a/rules/cramfs.make b/rules/cramfs.make index 6daa07839..18220df56 100644 --- a/rules/cramfs.make +++ b/rules/cramfs.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_CRAMFS -PACKAGES += cramfs -endif +PACKAGES-$(PTXCONF_CRAMFS) += cramfs # # Paths and names diff --git a/rules/crosstool.make b/rules/crosstool.make index 84f27528a..eb473cf0f 100644 --- a/rules/crosstool.make +++ b/rules/crosstool.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_CROSSTOOL -PACKAGES += crosstool -endif +PACKAGES-$(PTXCONF_CROSSTOOL) += crosstool # # Paths and names diff --git a/rules/db41.make b/rules/db41.make index cefe00c34..ac93c2ae2 100644 --- a/rules/db41.make +++ b/rules/db41.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DB41 -PACKAGES += db41 -endif +PACKAGES-$(PTXCONF_DB41) += db41 # # Paths and names diff --git a/rules/dbench.make b/rules/dbench.make index 529d5cd34..3a0293ce8 100644 --- a/rules/dbench.make +++ b/rules/dbench.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DBENCH -PACKAGES += dbench -endif +PACKAGES-$(PTXCONF_DBENCH) += dbench # # Paths and names diff --git a/rules/dhcp.make b/rules/dhcp.make index 049109b73..b6607f1ca 100644 --- a/rules/dhcp.make +++ b/rules/dhcp.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DHCP -PACKAGES += dhcp -endif +PACKAGES-$(PTXCONF_DHCP) += dhcp # # Paths and names diff --git a/rules/dialog.make b/rules/dialog.make index 053f49ab7..57d0a1e05 100644 --- a/rules/dialog.make +++ b/rules/dialog.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DIALOG -PACKAGES += dialog -endif +PACKAGES-$(PTXCONF_DIALOG) += dialog # # Paths and names diff --git a/rules/diffutils.make b/rules/diffutils.make index 7c875731b..b05be9114 100644 --- a/rules/diffutils.make +++ b/rules/diffutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DIFFUTILS -PACKAGES += diffutils -endif +PACKAGES-$(PTXCONF_DIFFUTILS) += diffutils # # Paths and names diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index 0ab294e61..d172e0ad7 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DNSMASQ -PACKAGES += dnsmasq -endif +PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq # # Paths and names diff --git a/rules/dosfstools.make b/rules/dosfstools.make index 3d373d7f8..0db543f41 100644 --- a/rules/dosfstools.make +++ b/rules/dosfstools.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_DOSFSTOOLS -PACKAGES += dosfstools -endif +PACKAGES-$(PTXCONF_DOSFSTOOLS) += dosfstools # # Paths and names diff --git a/rules/dropbear.make b/rules/dropbear.make index 4ce6c3841..a4c7cd56f 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_DROPBEAR -PACKAGES += dropbear -endif +PACKAGES-$(PTXCONF_DROPBEAR) += dropbear # # Paths and names diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index dc2e89250..fd5d4ae7d 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_E2FSPROGS -PACKAGES += e2fsprogs -endif +PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names diff --git a/rules/e2tools.make b/rules/e2tools.make index f3506d346..0e7f604ba 100644 --- a/rules/e2tools.make +++ b/rules/e2tools.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_E2TOOLS -PACKAGES += hosttool-e2tools -endif +PACKAGES-$(PTXCONF_E2TOOLS) += hosttool-e2tools # # Paths and names diff --git a/rules/efax.make b/rules/efax.make index 19ab4d151..b8bd2be30 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_EFAX -PACKAGES += efax -endif +PACKAGES-$(PTXCONF_EFAX) += efax # # Paths and names diff --git a/rules/ethereal.make b/rules/ethereal.make index 749ffa884..0f71d7146 100644 --- a/rules/ethereal.make +++ b/rules/ethereal.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_ETHEREAL -PACKAGES += ethereal -endif +PACKAGES-$(PTXCONF_ETHEREAL) += ethereal # # Paths and names diff --git a/rules/etherwake.make b/rules/etherwake.make index d85172379..07881baa5 100644 --- a/rules/etherwake.make +++ b/rules/etherwake.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_ETHERWAKE -PACKAGES += etherwake -endif +PACKAGES-$(PTXCONF_ETHERWAKE) += etherwake # # Paths and names diff --git a/rules/expat.make b/rules/expat.make index 01690f4ab..5e6ec2dca 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_EXPAT -PACKAGES += expat -endif +PACKAGES-$(PTXCONF_EXPAT) += expat # # Paths and names diff --git a/rules/fbtest.make b/rules/fbtest.make index a943c9094..571e6a548 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_FBTEST -PACKAGES += fbtest -endif +PACKAGES-$(PTXCONF_FBTEST) += fbtest # # Paths and names diff --git a/rules/fbutils.make b/rules/fbutils.make index 99579ae34..e8edc2886 100644 --- a/rules/fbutils.make +++ b/rules/fbutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_FBUTILS -PACKAGES += fbutils -endif +PACKAGES-$(PTXCONF_FBUTILS) += fbutils # # Paths and names diff --git a/rules/figlet.make b/rules/figlet.make index ad60d5876..2e1debbe3 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_FIGLET -PACKAGES += figlet -endif +PACKAGES-$(PTXCONF_FIGLET) += figlet # # Paths and names diff --git a/rules/flash.make b/rules/flash.make index 9e938d462..67268deaa 100644 --- a/rules/flash.make +++ b/rules/flash.make @@ -11,9 +11,7 @@ # # We provide this package # -ifeq (y,$(PTXCONF_FLASH)) -PACKAGES += flash -endif +PACKAGES-$(PTXCONF_FLASH) += flash # # Paths and names diff --git a/rules/flex.make b/rules/flex.make index 5c9d2419c..f2225dafc 100644 --- a/rules/flex.make +++ b/rules/flex.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_FLEX -PACKAGES += flex -endif +PACKAGES-$(PTXCONF_FLEX) += flex # # Paths and names diff --git a/rules/fltk.make b/rules/fltk.make index 0c8b3742b..80b835474 100644 --- a/rules/fltk.make +++ b/rules/fltk.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_FLTK -PACKAGES += fltk -endif +PACKAGES-$(PTXCONF_FLTK) += fltk # # Paths and names diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make index 94f6d708f..96d488331 100644 --- a/rules/fontconfig22.make +++ b/rules/fontconfig22.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_FONTCONFIG22 -PACKAGES += fontconfig22 -endif +PACKAGES-$(PTXCONF_FONTCONFIG22) += fontconfig22 # http://pdx.freedesktop.org/~fontconfig/release/fontconfig-2.2.92.tar.gz diff --git a/rules/freetype.make b/rules/freetype.make index aefd84a1f..a4377eabc 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_FREETYPE -PACKAGES += freetype -endif +PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names diff --git a/rules/gail.make b/rules/gail.make index 6821ef427..1cbebc80c 100644 --- a/rules/gail.make +++ b/rules/gail.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_GAIL -PACKAGES += gail -endif +PACKAGES-$(PTXCONF_GAIL) += gail # # Paths and names diff --git a/rules/gawk.make b/rules/gawk.make index e38e4129a..2ffc5a3a3 100644 --- a/rules/gawk.make +++ b/rules/gawk.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_GAWK -PACKAGES += gawk -endif +PACKAGES-$(PTXCONF_GAWK) += gawk # # Paths and names diff --git a/rules/gcclibs.make b/rules/gcclibs.make index 7af94b212..3dea99cc0 100644 --- a/rules/gcclibs.make +++ b/rules/gcclibs.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_GCCLIBS_GCC_S -PACKAGES += gcclibs -endif +PACKAGES-$(PTXCONF_GCCLIBS_GCC_S) += gcclibs # ---------------------------------------------------------------------------- diff --git a/rules/gdb-wrapper.make b/rules/gdb-wrapper.make index f23921fa8..91415fc33 100644 --- a/rules/gdb-wrapper.make +++ b/rules/gdb-wrapper.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_GDB_WRAPPER -PACKAGES += gdb-wrapper -endif +PACKAGES-$(PTXCONF_GDB_WRAPPER) += gdb-wrapper # ---------------------------------------------------------------------------- # Get diff --git a/rules/gdb.make b/rules/gdb.make index c5e6c4a00..c1cf97a47 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GDB -PACKAGES += gdb -endif +PACKAGES-$(PTXCONF_GDB) += gdb # # Paths and names diff --git a/rules/gdbserver.make b/rules/gdbserver.make index 9ab2537fc..109b406dc 100644 --- a/rules/gdbserver.make +++ b/rules/gdbserver.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GDBSERVER -PACKAGES += gdbserver -endif +PACKAGES-$(PTXCONF_GDBSERVER) += gdbserver GDBSERVER_BUILDDIR = $(BUILDDIR)/$(GDB)-server-build diff --git a/rules/gettext.make b/rules/gettext.make index 0f26dad6c..04517dc69 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GETTEXT -PACKAGES += gettext -endif +PACKAGES-$(PTXCONF_GETTEXT) += gettext # # Paths and names diff --git a/rules/glib1210.make b/rules/glib1210.make index c3924e871..70f395581 100644 --- a/rules/glib1210.make +++ b/rules/glib1210.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GLIB1210 -PACKAGES += glib1210 -endif +PACKAGES-$(PTXCONF_GLIB1210) += glib1210 # # Paths and names diff --git a/rules/glib22.make b/rules/glib22.make index 0c678a249..ee4902fec 100644 --- a/rules/glib22.make +++ b/rules/glib22.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GLIB22 -PACKAGES += glib22 -endif +PACKAGES-$(PTXCONF_GLIB22) += glib22 # # Paths and names diff --git a/rules/glib26.make b/rules/glib26.make index e19f4073f..da88ff098 100644 --- a/rules/glib26.make +++ b/rules/glib26.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GLIB26 -PACKAGES += glib26 -endif +PACKAGES-$(PTXCONF_GLIB26) += glib26 # # Paths and names diff --git a/rules/glibc.make b/rules/glibc.make index 444da9270..7e6e14708 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_GLIBC -PACKAGES += glibc -endif +PACKAGES-$(PTXCONF_GLIBC) += glibc GLIBC = glibc-$(GLIBC_VERSION) diff --git a/rules/gmp3.make b/rules/gmp3.make index 655b2d589..454d79bde 100644 --- a/rules/gmp3.make +++ b/rules/gmp3.make @@ -9,6 +9,11 @@ # # +# We provide this packet +# +PACKAGES-$(PTXCONF_GMP3) += gmp3 + +# # Paths and names # GMP3_VERSION = 3.1.1 diff --git a/rules/gnupg.make b/rules/gnupg.make index a047db994..c97cec578 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_GNUPG -PACKAGES += gnupg -endif +PACKAGES-$(PTXCONF_GNUPG) += gnupg # # Paths and names diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 0668e2deb..3756d68fd 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_GNUPLOT -PACKAGES += gnuplot -endif +PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot # # Paths and names diff --git a/rules/grub.make b/rules/grub.make index 641661fbf..0f645a510 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -11,9 +11,7 @@ # # We provide this package # -ifeq (y, $(PTXCONF_GRUB)) -PACKAGES += grub -endif +PACKAGES-$(PTXCONF_GRUB) += grub # # Paths and names diff --git a/rules/gtk1210.make b/rules/gtk1210.make index b8ce129ca..14035eeb2 100644 --- a/rules/gtk1210.make +++ b/rules/gtk1210.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GTK1210 -PACKAGES += gtk1210 -endif +PACKAGES-$(PTXCONF_GTK1210) += gtk1210 # # Paths and names diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make index de25533b4..e85d5e0bd 100644 --- a/rules/gtk2-engines.make +++ b/rules/gtk2-engines.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_GTK2-ENGINES -PACKAGES += gtk2-engines -endif +PACKAGES-$(PTXCONF_GTK2) += gtk2-engines # # Paths and names diff --git a/rules/gtk22.make b/rules/gtk22.make index 99ef94225..25374c8e6 100644 --- a/rules/gtk22.make +++ b/rules/gtk22.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_GTK22 -PACKAGES += gtk22 -endif +PACKAGES-$(PTXCONF_GTK22) += gtk22 # # Paths and names diff --git a/rules/hdparm.make b/rules/hdparm.make index 63a43b162..89d35010a 100644 --- a/rules/hdparm.make +++ b/rules/hdparm.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HDPARM -PACKAGES += hdparm -endif +PACKAGES-$(PTXCONF_HDPARM) += hdparm # # Paths and names diff --git a/rules/hexedit.make b/rules/hexedit.make index 65a308a95..d7ea223a4 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HEXEDIT -PACKAGES += hexedit -endif +PACKAGES-$(PTXCONF_HEXEDIT) += hexedit # # Paths and names diff --git a/rules/host-apache2.make b/rules/host-apache2.make index e7fdb4ed9..74cf76877 100644 --- a/rules/host-apache2.make +++ b/rules/host-apache2.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOST_APACHE2 -HOST_PACKAGES += host-apache2 -endif +HOST_PACKAGES-$(PTXCONF_HOST_APACHE2) += host-apache2 # # Paths and names diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index 56159e67b..007c5c14f 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_E2FSPROGS -HOST_PACKAGES += hosttool-e2fsprogs -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_E2FSPROGS) += hosttool-e2fsprogs # # Paths and names diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index 6181b775f..ac9724a00 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_FAKEROOT -HOST_PACKAGES += hosttool-fakeroot -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_FAKEROOT) += hosttool-fakeroot # # Paths and names diff --git a/rules/host-flex254.make b/rules/host-flex254.make index 495756fcb..de7ef2819 100644 --- a/rules/host-flex254.make +++ b/rules/host-flex254.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_FLEX254 -HOST_PACKAGES += hosttool-flex254 -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_FLEX254) += hosttool-flex254 # # Paths and names diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make index a2ca2b173..e338d10af 100644 --- a/rules/host-genext2fs.make +++ b/rules/host-genext2fs.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_GENEXT2FS -HOST_PACKAGES += hosttool-genext2fs -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_GENEXT2FS) += hosttool-genext2fs # # Paths and names diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index 0636e99b0..8e354e046 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_IPKG_UTILS -HOST_PACKAGES += hosttool-ipkg-utils -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_IPKG_UTILS) += hosttool-ipkg-utils # # Paths and names diff --git a/rules/host-ipkg.make b/rules/host-ipkg.make index bd81de52e..2a0fdd659 100644 --- a/rules/host-ipkg.make +++ b/rules/host-ipkg.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_IPKG -HOST_PACKAGES += hosttool-ipkg -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_IPKG) += hosttool-ipkg # # Paths and names diff --git a/rules/host-ksymoops.make b/rules/host-ksymoops.make index 3abeed95b..dc22fd477 100644 --- a/rules/host-ksymoops.make +++ b/rules/host-ksymoops.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_KSYMOOPS -HOST_PACKAGES += hosttool-ksymoops -endif +HOST_PACKAGES-$(PTXCONF_KSYMOOPS) += hosttool-ksymoops # # Paths and names diff --git a/rules/host-mknbi.make b/rules/host-mknbi.make index 88fc927ca..26dee1c17 100644 --- a/rules/host-mknbi.make +++ b/rules/host-mknbi.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_MKNBI -HOST_PACKAGES += hosttool-mknbi -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MKNBI) += hosttool-mknbi # # Paths and names diff --git a/rules/host-module-init-tools.make b/rules/host-module-init-tools.make index 6b9cb4cfb..a48063430 100644 --- a/rules/host-module-init-tools.make +++ b/rules/host-module-init-tools.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_MODULE_INIT_TOOLS -HOST_PACKAGES += hosttool-module-init-tools -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MODULE_INIT_TOOLS) += hosttool-module-init-tools # # Paths and names diff --git a/rules/host-modutils.make b/rules/host-modutils.make index 4cd9b90d5..ea9cdfb32 100644 --- a/rules/host-modutils.make +++ b/rules/host-modutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_MODUTILS -HOST_PACKAGES += hosttool-modutils -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MODUTILS) += hosttool-modutils # # Paths and names diff --git a/rules/host-mtd.make b/rules/host-mtd.make index d122fbc6a..cdf79c25c 100644 --- a/rules/host-mtd.make +++ b/rules/host-mtd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_MTD -HOST_PACKAGES += hosttool-mtd -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MTD) += hosttool-mtd # # Paths and names diff --git a/rules/host-qte.make b/rules/host-qte.make index 94ffc7ffa..ee2c4864b 100644 --- a/rules/host-qte.make +++ b/rules/host-qte.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOST_QTE -HOST_PACKAGES += host-qte -endif +HOST_PACKAGES-$(PTXCONF_HOST_QTE) += host-qte # # Paths and names diff --git a/rules/host-slirp.make b/rules/host-slirp.make index eff8d4208..bd75c4226 100644 --- a/rules/host-slirp.make +++ b/rules/host-slirp.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOST_SLIRP -HOST_PACKAGES += host-slirp -endif +HOST_PACKAGES-$(PTXCONF_HOST_SLIRP) += host-slirp # # Paths and names diff --git a/rules/host-termcap.make b/rules/host-termcap.make index b26d60496..d3907ccf3 100644 --- a/rules/host-termcap.make +++ b/rules/host-termcap.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOST_TERMCAP -HOST_PACKAGES += host-termcap -endif +HOST_PACKAGES-$(PTXCONF_HOST_TERMCAP) += host-termcap # # Paths and names diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index 139a38b86..8576a4849 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_HOSTTOOL_UMKIMAGE -HOST_PACKAGES += hosttool-umkimage -endif +HOST_PACKAGES-$(PTXCONF_HOSTTOOL_UMKIMAGE) += hosttool-umkimage # # Paths and names diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index 37900fc1d..2e35a328d 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -13,6 +13,9 @@ # Paths and names # +# FIXME: RSC: check if this is correct +HOSTPACKAGES-$(HOSTTOOL_UTIL-LINUX) += hosttool-util-linux + HOSTTOOL_UTIL-LINUX_DIR = $(BUILDDIR)/hosttool/$(UTIL-LINUX) # ---------------------------------------------------------------------------- diff --git a/rules/host-zlib.make b/rules/host-zlib.make index 77da6c669..5b1fd63d7 100644 --- a/rules/host-zlib.make +++ b/rules/host-zlib.make @@ -8,6 +8,8 @@ # see the README file. # +HOST_PACKAGES-$(HOSTTOOL_ZLIB) += hosttool-zlib + # # Paths and names # diff --git a/rules/hotplug.make b/rules/hotplug.make index def6af807..11927fac0 100644 --- a/rules/hotplug.make +++ b/rules/hotplug.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_HOTPLUG -PACKAGES += hotplug -endif +PACKAGES-$(PTXCONF_HOTPLUG) += hotplug # # Paths and names diff --git a/rules/inetutils.make b/rules/inetutils.make index 9defd689f..34d822435 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_INETUTILS -PACKAGES += inetutils -endif +PACKAGES-$(PTXCONF_INETUTILS) += inetutils # # Paths and names diff --git a/rules/ipkg.make b/rules/ipkg.make index 1617879f6..9efa6b15d 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_IPKG -PACKAGES += ipkg -endif +PACKAGES-$(PTXCONF_IPKG) += ipkg # # Paths and names diff --git a/rules/iptables.make b/rules/iptables.make index 6af2d15ca..451dd85f4 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_IPTABLES -PACKAGES += iptables -endif +PACKAGES-$(PTXCONF_IPTABLES) += iptables # # Paths and names diff --git a/rules/jed.make b/rules/jed.make index d778b8c51..093c83c61 100644 --- a/rules/jed.make +++ b/rules/jed.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_JED -PACKAGES += jed -endif +PACKAGES-$(PTXCONF_JED) += jed # # Paths and names diff --git a/rules/joe.make b/rules/joe.make index f68bc3369..1e1cf4208 100644 --- a/rules/joe.make +++ b/rules/joe.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_JOE -PACKAGES += joe -endif +PACKAGES-$(PTXCONF_JOE) += joe # # Paths and names diff --git a/rules/jvisu.make b/rules/jvisu.make index 41ffb7a91..715a52010 100644 --- a/rules/jvisu.make +++ b/rules/jvisu.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_JVISU -PACKAGES += jvisu -endif +PACKAGES-$(PTXCONF_JVISU) += jvisu # # Paths and names diff --git a/rules/kaffe.make b/rules/kaffe.make index ed577832a..317bcdabc 100644 --- a/rules/kaffe.make +++ b/rules/kaffe.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_KAFFE -PACKAGES += kaffe -endif +PACKAGES-$(PTXCONF_KAFFE) += kaffe # # Paths and names diff --git a/rules/kernel-native.make b/rules/kernel-native.make index 4661248d2..9bd8b6dc1 100644 --- a/rules/kernel-native.make +++ b/rules/kernel-native.make @@ -14,9 +14,7 @@ # ifdef NATIVE -ifdef PTXCONF_KERNEL_HOST -PACKAGES += kernel -endif +PACKAGES-$(PTXCONF_KERNEL_HOST) += kernel # # Use a PTXdist built kernel which is parametrized here or use one from diff --git a/rules/kernel.make b/rules/kernel.make index 2ef8c8bff..8db179e93 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -16,13 +16,13 @@ ifndef NATIVE ifdef PTXCONF_KERNEL_2_4 -PACKAGES += kernel +PACKAGES-$(PTXCONF_KERNEL_2_4) += kernel endif ifdef PTXCONF_KERNEL_2_6 -PACKAGES += kernel +PACKAGES-$(PTXCONF_KERNEL_2_6) += kernel endif ifdef PTXCONF_USE_EXTERNAL_KERNEL -PACKAGES += kernel +PACKAGES-$(PTXCONF_USE_EXTERNAL_KERNEL) += kernel endif @@ -555,7 +555,6 @@ kernel_targetinstall_deps = $(STATEDIR)/kernel.compile $(STATEDIR)/kernel.targetinstall: $(kernel_targetinstall_deps) @$(call targetinfo, $@) -ifndef PTXCONF_DONT_COMPILE_KERNEL ifdef PTXCONF_KERNEL_INSTALL @$(call install_init,default) @$(call install_fixup,PACKAGE,kernel) @@ -597,7 +596,6 @@ ifdef PTXCONF_KERNEL_INSTALL_MODULES @$(call install_finish) endif -endif $(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/konq-e.make b/rules/konq-e.make index 7c022dcde..941f56399 100644 --- a/rules/konq-e.make +++ b/rules/konq-e.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_KONQ-E -PACKAGES += konq-e -endif +PACKAGES-$(PTXCONF_KONQ-E) += konq-e # # Paths and names diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make index a611c8909..129794ec4 100644 --- a/rules/libIDL-2.make +++ b/rules/libIDL-2.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_LIBIDL-2 -PACKAGES += libidl-2 -endif +PACKAGES-$(PTXCONF_LIBIDL-2) += libidl-2 # # Paths and names diff --git a/rules/libIDL068.make b/rules/libIDL068.make index ebc8e0129..122bbbec6 100644 --- a/rules/libIDL068.make +++ b/rules/libIDL068.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_LIBIDL068 -PACKAGES += libidl068 -endif +PACKAGES-$(PTXCONF_LIBIDL068) += libidl068 # # Paths and names diff --git a/rules/libart.make b/rules/libart.make index 661b55e60..738568d47 100644 --- a/rules/libart.make +++ b/rules/libart.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBART -PACKAGES += libart -endif +PACKAGES-$(PTXCONF_LIBART) += libart # # Paths and names diff --git a/rules/libcgicc.make b/rules/libcgicc.make index d57726192..99ed9582a 100644 --- a/rules/libcgicc.make +++ b/rules/libcgicc.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_CGICC -PACKAGES += cgicc -endif +PACKAGES-$(PTXCONF_CGICC) += cgicc # # Paths and names diff --git a/rules/libgd.make b/rules/libgd.make index 5fe40305c..77f0cf170 100644 --- a/rules/libgd.make +++ b/rules/libgd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBGD -PACKAGES += libgd -endif +PACKAGES-$(PTXCONF_LIBGD) += libgd # # Paths and names diff --git a/rules/libglade.make b/rules/libglade.make index 9ad3ec6ad..2dfe1cfa3 100644 --- a/rules/libglade.make +++ b/rules/libglade.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBGLADE -PACKAGES += libglade -endif +PACKAGES-$(PTXCONF_LIBGLADE) += libglade # # Paths and names diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make index b7ffe00cf..c5447972a 100644 --- a/rules/libgnomecanvas.make +++ b/rules/libgnomecanvas.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBGNOMECANVAS -PACKAGES += libgnomecanvas -endif +PACKAGES-$(PTXCONF_LIBGNOMECANVAS) += libgnomecanvas # # Paths and names diff --git a/rules/libgsloop.make b/rules/libgsloop.make index 477692609..d51c403ee 100644 --- a/rules/libgsloop.make +++ b/rules/libgsloop.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBGSLOOP -PACKAGES += libgsloop -endif +PACKAGES-$(PTXCONF_LIBGSLOOP) += libgsloop # # Paths and names diff --git a/rules/liblist.make b/rules/liblist.make index 9351a92d4..5a53a152b 100644 --- a/rules/liblist.make +++ b/rules/liblist.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBLIST -PACKAGES += liblist -endif +PACKAGES-$(PTXCONF_LIBLIST) += liblist # # Paths and names diff --git a/rules/libnet.make b/rules/libnet.make index 2546a34c4..ef4d30e64 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBNET -PACKAGES += libnet -endif +PACKAGES-$(PTXCONF_LIBNET) += libnet # # Paths and names diff --git a/rules/liboop.make b/rules/liboop.make index 2d7211551..2dcd44608 100644 --- a/rules/liboop.make +++ b/rules/liboop.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBOOP -PACKAGES += liboop -endif +PACKAGES-$(PTXCONF_LIBOOP) += liboop # # Paths and names diff --git a/rules/libpcap.make b/rules/libpcap.make index 45c1fbeeb..50ebb264c 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBPCAP -PACKAGES += libpcap -endif +PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names diff --git a/rules/libpng125.make b/rules/libpng125.make index 82517982b..97277b129 100644 --- a/rules/libpng125.make +++ b/rules/libpng125.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_LIBPNG125 -PACKAGES += libpng125 -endif +PACKAGES-$(PTXCONF_LIBPNG125) += libpng125 # # Paths and names diff --git a/rules/libpv.make b/rules/libpv.make index e7521c463..c0e74d87d 100644 --- a/rules/libpv.make +++ b/rules/libpv.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBPV -PACKAGES += libpv -endif +PACKAGES-$(PTXCONF_LIBPV) += libpv # # Paths and names diff --git a/rules/librn.make b/rules/librn.make index f15f62929..1187c3249 100644 --- a/rules/librn.make +++ b/rules/librn.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_LIBRN -PACKAGES += librn -endif +PACKAGES-$(PTXCONF_LIBRN) += librn # # Paths and names diff --git a/rules/libxml2.make b/rules/libxml2.make index f8631e1f1..cd5fbc6da 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBXML2 -PACKAGES += libxml2 -endif +PACKAGES-$(PTXCONF_LIBXML2) += libxml2 # # Paths and names diff --git a/rules/libxmlconfig.make b/rules/libxmlconfig.make index 2a2eab11b..7398b37c3 100644 --- a/rules/libxmlconfig.make +++ b/rules/libxmlconfig.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBXMLCONFIG -PACKAGES += libxmlconfig -endif +PACKAGES-$(PTXCONF_LIBXMLCONFIG) += libxmlconfig # # Paths and names diff --git a/rules/libxslt.make b/rules/libxslt.make index c570da4a4..4d23ce25a 100644 --- a/rules/libxslt.make +++ b/rules/libxslt.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LIBXSLT -PACKAGES += libxslt -endif +PACKAGES-$(PTXCONF_LIBXSLT) += libxslt # # Paths and names diff --git a/rules/lilo.make b/rules/lilo.make index b8aa13db2..8304494e7 100644 --- a/rules/lilo.make +++ b/rules/lilo.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_LILO -PACKAGES += lilo -endif +PACKAGES-$(PTXCONF_LILO) += lilo # # Paths and names diff --git a/rules/lrzsz.make b/rules/lrzsz.make index 5a0d5dd70..ab5689eb3 100644 --- a/rules/lrzsz.make +++ b/rules/lrzsz.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_LRZSZ -PACKAGES += lrzsz -endif +PACKAGES-$(PTXCONF_LRZSZ) += lrzsz # # Paths and names diff --git a/rules/lsh.make b/rules/lsh.make index 2299eaf48..2ed71af29 100644 --- a/rules/lsh.make +++ b/rules/lsh.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LSH -PACKAGES += lsh -endif +PACKAGES-$(PTXCONF_LSH) += lsh # # Paths and names diff --git a/rules/ltp.make b/rules/ltp.make index b91435f43..402febac5 100644 --- a/rules/ltp.make +++ b/rules/ltp.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LTP -PACKAGES += ltp -endif +PACKAGES-$(PTXCONF_LTP) += ltp # # Paths and names diff --git a/rules/ltt.make b/rules/ltt.make index 9c05cf40f..941c1b985 100644 --- a/rules/ltt.make +++ b/rules/ltt.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LTT -PACKAGES += ltt -endif +PACKAGES-$(PTXCONF_LTT) += ltt # # Paths and names diff --git a/rules/mad.make b/rules/mad.make index 20cdc1cee..d0a391fca 100644 --- a/rules/mad.make +++ b/rules/mad.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MAD -PACKAGES += mad -endif +PACKAGES-$(PTXCONF_MAD) += mad # # Paths and names diff --git a/rules/madwifi.make b/rules/madwifi.make index 78a6aa9d7..f02919a07 100644 --- a/rules/madwifi.make +++ b/rules/madwifi.make @@ -22,9 +22,7 @@ # # -ifdef PTXCONF_MADWIFI -PACKAGES += madwifi -endif +PACKAGES-$(PTXCONF_MADWIFI) += madwifi # # Paths and names diff --git a/rules/memedit.make b/rules/memedit.make index 016ffebed..59f5a79e5 100644 --- a/rules/memedit.make +++ b/rules/memedit.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MEMEDIT -PACKAGES += memedit -endif +PACKAGES-$(PTXCONF_MEMEDIT) += memedit # # Paths and names diff --git a/rules/memstat.make b/rules/memstat.make index 77763ed21..8b182f02c 100644 --- a/rules/memstat.make +++ b/rules/memstat.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MEMSTAT -PACKAGES += memstat -endif +PACKAGES-$(PTXCONF_MEMSTAT) += memstat # # Paths and names diff --git a/rules/memtest.make b/rules/memtest.make index d0bbc1ecb..ed2174d5d 100644 --- a/rules/memtest.make +++ b/rules/memtest.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MEMTEST -PACKAGES += memtest -endif +PACKAGES-$(PTXCONF_MEMTEST) += memtest # # Paths and names diff --git a/rules/memtester.make b/rules/memtester.make index 3afa1e854..2a2c72fa4 100644 --- a/rules/memtester.make +++ b/rules/memtester.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MEMTESTER -PACKAGES += memtester -endif +PACKAGES-$(PTXCONF_MEMTESTER) += memtester # # Paths and names diff --git a/rules/mfirebird.make b/rules/mfirebird.make index 9effa7ffe..1062e4f17 100644 --- a/rules/mfirebird.make +++ b/rules/mfirebird.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_MFIREBIRD -PACKAGES += mfirebird -endif +PACKAGES-$(PTXCONF_MFIREBIRD) += mfirebird # # Paths and names diff --git a/rules/mgetty.make b/rules/mgetty.make index 9206a69bb..4489c2ff4 100644 --- a/rules/mgetty.make +++ b/rules/mgetty.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MGETTY -PACKAGES += mgetty -endif +PACKAGES-$(PTXCONF_MGETTY) += mgetty # # Paths and names diff --git a/rules/mii-diag.make b/rules/mii-diag.make index b2701e082..62bd38861 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MII-DIAG -PACKAGES += mii-diag -endif +PACKAGES-$(PTXCONF_MII-DIAG) += mii-diag # # Paths and names diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index ef463edf6..3c902986d 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MODULE_INIT_TOOLS -PACKAGES += module-init-tools -endif +PACKAGES-$(PTXCONF_MODULE_INIT_TOOLS) += module-init-tools # # Paths and names diff --git a/rules/mtd.make b/rules/mtd.make index e0669944b..404d31afe 100644 --- a/rules/mtd.make +++ b/rules/mtd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MTD_UTILS -PACKAGES += mtd -endif +PACKAGES-$(PTXCONF_MTD_UTILS) += mtd # # Paths and names diff --git a/rules/myghty.make b/rules/myghty.make index 0ce50675a..24e8434d3 100644 --- a/rules/myghty.make +++ b/rules/myghty.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_MYGHTY -PACKAGES += myghty -endif +PACKAGES-$(PTXCONF_MYGHTY) += myghty # # Paths and names diff --git a/rules/nano.make b/rules/nano.make index dcf15752b..fa7736dfe 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_NANO -PACKAGES += nano -endif +PACKAGES-$(PTXCONF_NANO) += nano # # Paths and names diff --git a/rules/ncurses.make b/rules/ncurses.make index b782d510a..62de28b3d 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_NCURSES -PACKAGES += ncurses -endif +PACKAGES-$(PTXCONF_NCURSES) += ncurses # # Paths and names diff --git a/rules/netcat.make b/rules/netcat.make index 348d6b6a2..a1e71f6df 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_NETCAT -PACKAGES += netcat -endif +PACKAGES-$(PTXCONF_NETCAT) += netcat # # Paths and names diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make index adc54855e..29c39f932 100644 --- a/rules/netkit-ftp.make +++ b/rules/netkit-ftp.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_NETKIT-FTP -PACKAGES += netkit-ftp -endif +PACKAGES-$(PTXCONF_NETKIT-FTP) += netkit-ftp # # Paths and names diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make index 36d685998..875781255 100644 --- a/rules/nfs-utils.make +++ b/rules/nfs-utils.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_NFSUTILS -PACKAGES += nfsutils -endif +PACKAGES-$(PTXCONF_NFSUTILS) += nfsutils # # Paths and names diff --git a/rules/nmap.make b/rules/nmap.make index b2c76b7cd..80f129b65 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_NMAP -PACKAGES += nmap -endif +PACKAGES-$(PTXCONF_NMAP) += nmap # # We depend on this package diff --git a/rules/ntp.make b/rules/ntp.make index 2d8a28cde..07bde07b1 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_NTP -PACKAGES += ntp -endif +PACKAGES-$(PTXCONF_NTP) += ntp # # Paths and names diff --git a/rules/ntpclient.make b/rules/ntpclient.make index 8b654f339..55b6e43bf 100644 --- a/rules/ntpclient.make +++ b/rules/ntpclient.make @@ -4,9 +4,7 @@ # # We provide this package # -ifdef PTXCONF_NTPCLIENT -PACKAGES += ntpclient -endif +PACKAGES-$(PTXCONF_NTPCLIENT) += ntpclient # # Paths and names diff --git a/rules/omniorb.make b/rules/omniorb.make index 2371d0533..d2a2e33d4 100644 --- a/rules/omniorb.make +++ b/rules/omniorb.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_OMNIORB -PACKAGES += omniorb -endif +PACKAGES-$(PTXCONF_OMNIORB) += omniorb # # Paths and names diff --git a/rules/openafs.make b/rules/openafs.make index d2f593ab0..e88668ef3 100644 --- a/rules/openafs.make +++ b/rules/openafs.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_OPENAFS -PACKAGES += openafs -endif +PACKAGES-$(PTXCONF_OPENAFS) += openafs # # Paths and names diff --git a/rules/openntpd.make b/rules/openntpd.make index 664aab57e..292a27d99 100644 --- a/rules/openntpd.make +++ b/rules/openntpd.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_OPENNTPD -PACKAGES += openntpd -endif +PACKAGES-$(PTXCONF_OPENNTPD) += openntpd # # Paths and names diff --git a/rules/openssh.make b/rules/openssh.make index e687b8746..41796eecc 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_OPENSSH -PACKAGES += openssh -endif +PACKAGES-$(PTXCONF_OPENSSH) += openssh # # We depend on this package diff --git a/rules/openssl.make b/rules/openssl.make index 5805ad6fb..208676768 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_OPENSSL -PACKAGES += openssl -endif +PACKAGES-$(PTXCONF_OPENSSL) += openssl # # Paths and names diff --git a/rules/oprofile.make b/rules/oprofile.make index aae50710e..d5eed9c10 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_OPROFILE -PACKAGES += oprofile -endif +PACKAGES-$(PTXCONF_OPROFILE) += oprofile # # Paths and names diff --git a/rules/pango12.make b/rules/pango12.make index 54be53a3c..3fac496d9 100644 --- a/rules/pango12.make +++ b/rules/pango12.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_PANGO12 -PACKAGES += pango -endif +PACKAGES-$(PTXCONF_PANGO12) += pango # # Paths and names diff --git a/rules/paranoia.make b/rules/paranoia.make index 593358fef..a365789be 100644 --- a/rules/paranoia.make +++ b/rules/paranoia.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_PARANOIA -PACKAGES += paranoia -endif +PACKAGES-$(PTXCONF_PARANOIA) += paranoia # # Paths and names diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make index 98958d1c2..0f0bde3d7 100644 --- a/rules/pcmcia-cs.make +++ b/rules/pcmcia-cs.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PCMCIA_TOOLS -PACKAGES += pcmcia-cs -endif +PACKAGES-$(PTXCONF_PCMCIA_TOOLS) += pcmcia-cs # # Paths and names diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index db37679d6..58d1917b9 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_PCMCIAUTILS -PACKAGES += pcmciautils -endif +PACKAGES-$(PTXCONF_PCMCIAUTILS) += pcmciautils # # Paths and names diff --git a/rules/pcre.make b/rules/pcre.make index f5f15a806..32d53e181 100644 --- a/rules/pcre.make +++ b/rules/pcre.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_PCRE -PACKAGES += pcre -endif +PACKAGES-$(PTXCONF_PCRE) += pcre # # Paths and names diff --git a/rules/pdksh.make b/rules/pdksh.make index 19a725395..f310cefb7 100644 --- a/rules/pdksh.make +++ b/rules/pdksh.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_PDKSH -PACKAGES += pdksh -endif +PACKAGES-$(PTXCONF_PDKSH) += pdksh # # Paths and names diff --git a/rules/penguzilla.make b/rules/penguzilla.make index 81097e373..ddb3b74ba 100644 --- a/rules/penguzilla.make +++ b/rules/penguzilla.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PENGUZILLA -PACKAGES += penguzilla -endif +PACKAGES-$(PTXCONF_PENGUZILLA) += penguzilla # # Paths and names diff --git a/rules/php-apc.make b/rules/php-apc.make index 889bc2e1b..10fa6ee4f 100644 --- a/rules/php-apc.make +++ b/rules/php-apc.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PHP_APC -PACKAGES += php-apc -endif +PACKAGES-$(PTXCONF_PHP_APC) += php-apc # # Paths and names diff --git a/rules/php.make b/rules/php.make index 1d7d7afbf..42dbbe576 100644 --- a/rules/php.make +++ b/rules/php.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PHP -PACKAGES += php -endif +PACKAGES-$(PTXCONF_PHP) += php # # Paths and names diff --git a/rules/pnet.make b/rules/pnet.make index f92383c45..333644627 100644 --- a/rules/pnet.make +++ b/rules/pnet.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PNET -PACKAGES += pnet -endif +PACKAGES-$(PTXCONF_PNET) += pnet # # Paths and names diff --git a/rules/pnetlib.make b/rules/pnetlib.make index b49dbe202..3b863b127 100644 --- a/rules/pnetlib.make +++ b/rules/pnetlib.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PNETLIB -PACKAGES += pnetlib -endif +PACKAGES-$(PTXCONF_PNETLIB) += pnetlib # # Paths and names diff --git a/rules/pop3spam.make b/rules/pop3spam.make index dad4615ce..a05197165 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_POP3SPAM -PACKAGES += pop3spam -endif +PACKAGES-$(PTXCONF_POP3SPAM) += pop3spam # # Paths and names diff --git a/rules/popt.make b/rules/popt.make index 600fd1273..c2ea35a64 100644 --- a/rules/popt.make +++ b/rules/popt.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_POPT -PACKAGES += popt -endif +PACKAGES-$(PTXCONF_POPT) += popt # # Paths and names diff --git a/rules/portmap.make b/rules/portmap.make index d757c151b..bfc6c8744 100644 --- a/rules/portmap.make +++ b/rules/portmap.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_PORTMAP -PACKAGES += portmap -endif +PACKAGES-$(PTXCONF_PORTMAP) += portmap # # Paths and names diff --git a/rules/pppd.make b/rules/pppd.make index d04d11e77..cb1490912 100644 --- a/rules/pppd.make +++ b/rules/pppd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PPP -PACKAGES += ppp -endif +PACKAGES-$(PTXCONF_PPP) += ppp # # Paths and names diff --git a/rules/procps.make b/rules/procps.make index 3d4859a13..fd5d0098e 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PROCPS -PACKAGES += procps -endif +PACKAGES-$(PTXCONF_PROCPS) += procps # # Paths and names diff --git a/rules/proftpd.make b/rules/proftpd.make index 64d54795e..04104d9d1 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PROFTPD -PACKAGES += proftpd -endif +PACKAGES-$(PTXCONF_PROFTPD) += proftpd # # Paths and names diff --git a/rules/pureftpd.make b/rules/pureftpd.make index 1d56e88ab..33cea4da3 100644 --- a/rules/pureftpd.make +++ b/rules/pureftpd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PUREFTPD -PACKAGES += pureftpd -endif +PACKAGES-$(PTXCONF_PUREFTPD) += pureftpd # # Paths and names diff --git a/rules/python.make b/rules/python.make index b43650afe..cf6309e0a 100644 --- a/rules/python.make +++ b/rules/python.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_PYTHON23 -PACKAGES += python -endif +PACKAGES-$(PTXCONF_PYTHON23) += python # # Paths and names diff --git a/rules/python24.make b/rules/python24.make index ce7e62eb1..6cdbb8862 100644 --- a/rules/python24.make +++ b/rules/python24.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_PYTHON24 -PACKAGES += python24 -endif +PACKAGES-$(PTXCONF_PYTHON24) += python24 # # Paths and names diff --git a/rules/qt.make b/rules/qt.make index 73a30795c..3b4d2b39f 100644 --- a/rules/qt.make +++ b/rules/qt.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_QT -PACKAGES += qt -endif +PACKAGES-$(PTXCONF_QT) += qt # # Paths and names diff --git a/rules/qte.make b/rules/qte.make index 66f742aed..039f1f79c 100644 --- a/rules/qte.make +++ b/rules/qte.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_QTE -PACKAGES += qte -endif +PACKAGES-$(PTXCONF_QTE) += qte # # Paths and names diff --git a/rules/rawrec.make b/rules/rawrec.make index e7ab2c613..eb7444d11 100644 --- a/rules/rawrec.make +++ b/rules/rawrec.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_RAWREC -PACKAGES += rawrec -endif +PACKAGES-$(PTXCONF_RAWREC) += rawrec # # Paths and names diff --git a/rules/readline.make b/rules/readline.make index faba44f68..ce451c7c1 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_READLINE -PACKAGES += readline -endif +PACKAGES-$(PTXCONF_READLINE) += readline # # Paths and names diff --git a/rules/realvnc.make b/rules/realvnc.make index 899a7c07c..d2b44a273 100644 --- a/rules/realvnc.make +++ b/rules/realvnc.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_REALVNC -PACKAGES += realvnc -endif +PACKAGES-$(PTXCONF_REALVNC) += realvnc # # Paths and names diff --git a/rules/rootfs.make b/rules/rootfs.make index fb8555c53..494ec4d1b 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_ROOTFS -PACKAGES += rootfs -endif +PACKAGES-$(PTXCONF_ROOTFS) += rootfs # ---------------------------------------------------------------------------- # Get diff --git a/rules/rsync.make b/rules/rsync.make index 4a40899c5..68dfd42cd 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_RSYNC -PACKAGES += rsync -endif +PACKAGES-$(PTXCONF_RSYNC) += rsync # # Paths and names diff --git a/rules/rtai.make b/rules/rtai.make index 052cd0fb0..69cf2125c 100644 --- a/rules/rtai.make +++ b/rules/rtai.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_RTAI -PACKAGES += rtai -endif +PACKAGES-$(PTXCONF_RTAI) += rtai # # Paths and names diff --git a/rules/rtnet.make b/rules/rtnet.make index c7093a64e..1f2488738 100644 --- a/rules/rtnet.make +++ b/rules/rtnet.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_RTNET -PACKAGES += rtnet -endif +PACKAGES-$(PTXCONF_RTNET) += rtnet # # Paths and names diff --git a/rules/setmixer.make b/rules/setmixer.make index d686399be..9e07a6f86 100644 --- a/rules/setmixer.make +++ b/rules/setmixer.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_SETMIXER -PACKAGES += setmixer -endif +PACKAGES-$(PTXCONF_SETMIXER) += setmixer # # Paths and names diff --git a/rules/shorewall.make b/rules/shorewall.make index 3c6cf0c8e..3ad6c0eb6 100644 --- a/rules/shorewall.make +++ b/rules/shorewall.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_SHOREWALL -PACKAGES += shorewall -endif +PACKAGES-$(PTXCONF_SHOREWALL) += shorewall # # Paths and names diff --git a/rules/slang.make b/rules/slang.make index 9ebe49c76..f7c6ffe85 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_SLANG -PACKAGES += slang -endif +PACKAGES-$(PTXCONF_SLANG) += slang # # Paths and names diff --git a/rules/smtpclient.make b/rules/smtpclient.make index 71a031114..ebce54b8f 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_SMTPCLIENT -PACKAGES += smtpclient -endif +PACKAGES-$(PTXCONF_SMTPCLIENT) += smtpclient # # Paths and names diff --git a/rules/sqlite.make b/rules/sqlite.make index 7ed5c8b68..099ea7c34 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_SQLITE -PACKAGES += sqlite -endif +PACKAGES-$(PTXCONF_SQLITE) += sqlite # # Paths and names diff --git a/rules/ssmtp.make b/rules/ssmtp.make index f3a21b42b..c3748950d 100644 --- a/rules/ssmtp.make +++ b/rules/ssmtp.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_SSMTP -PACKAGES += ssmtp -endif +PACKAGES-$(PTXCONF_SSMTP) += ssmtp # # Paths and names diff --git a/rules/strace.make b/rules/strace.make index 989585c5d..a7c97cf94 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_STRACE -PACKAGES += strace -endif +PACKAGES-$(PTXCONF_STRACE) += strace # # Paths and names diff --git a/rules/sudo.make b/rules/sudo.make index 3c25bf743..1e72bf307 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_SUDO -PACKAGES += sudo -endif +PACKAGES-$(PTXCONF_SUDO) += sudo # # Paths and names diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 4993b8163..0e950a481 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_SYSFSUTILS -PACKAGES += sysfsutils -endif +PACKAGES-$(PTXCONF_SYSFSUTILS) += sysfsutils # # Paths and names diff --git a/rules/sysutils.make b/rules/sysutils.make index 959cda0a4..f8956632c 100644 --- a/rules/sysutils.make +++ b/rules/sysutils.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_SYSUTILS -PACKAGES += sysutils -endif +PACKAGES-$(PTXCONF_SYSUTILS) += sysutils # # Paths and names diff --git a/rules/sysvinit.make b/rules/sysvinit.make index 8c10f0249..8942f1c6c 100644 --- a/rules/sysvinit.make +++ b/rules/sysvinit.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_SYSVINIT -PACKAGES += sysvinit -endif +PACKAGES-$(PTXCONF_SYSVINIT) += sysvinit # # Paths and names diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 56c72f0b5..3c817ac50 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_TCPDUMP -PACKAGES += tcpdump -endif +PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump # # Paths and names diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make index 0e06eb33b..4db9bc71a 100644 --- a/rules/tcpwrapper.make +++ b/rules/tcpwrapper.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_TCPWRAPPER -PACKAGES += tcpwrapper -endif +PACKAGES-$(PTXCONF_TCPWRAPPER) += tcpwrapper # # Paths and names diff --git a/rules/termcap.make b/rules/termcap.make index 712df5a25..0139b65cf 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_TERMCAP -PACKAGES += termcap -endif +PACKAGES-$(PTXCONF_TERMCAP) += termcap # # Paths and names diff --git a/rules/thttpd.make b/rules/thttpd.make index 265da112e..584287ff3 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_THTTPD -PACKAGES += thttpd -endif +PACKAGES-$(PTXCONF_THTTPD) += thttpd # # Paths and names diff --git a/rules/tinylogin.make b/rules/tinylogin.make index 5c10e0251..4368fbd03 100644 --- a/rules/tinylogin.make +++ b/rules/tinylogin.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_TINYLOGIN -PACKAGES += tinylogin -endif +PACKAGES-$(PTXCONF_TINYLOGIN) += tinylogin # # Paths and names diff --git a/rules/treecc.make b/rules/treecc.make index 09e4519a8..62f755573 100644 --- a/rules/treecc.make +++ b/rules/treecc.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_TREECC -PACKAGES += treecc -endif +PACKAGES-$(PTXCONF_TREECC) += treecc # # Paths and names diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make index 3e0d690f1..60700c93f 100644 --- a/rules/troll-ftpd.make +++ b/rules/troll-ftpd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_TROLL-FTPD -PACKAGES += troll-ftpd -endif +PACKAGES-$(PTXCONF_TROLL-FTPD) += troll-ftpd # # Paths and names diff --git a/rules/tslib.make b/rules/tslib.make index 99084d776..fc571919b 100644 --- a/rules/tslib.make +++ b/rules/tslib.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_TSLIB -PACKAGES += tslib -endif +PACKAGES-$(PTXCONF_TSLIB) += tslib # # Paths and names diff --git a/rules/uclibc.make b/rules/uclibc.make index 0eb2e912d..77a2c678f 100644 --- a/rules/uclibc.make +++ b/rules/uclibc.make @@ -12,8 +12,8 @@ # # We provide this package # +PACKAGES-$(PTXCONF_UCLIBC) += uclibc ifdef PTXCONF_UCLIBC -PACKAGES += uclibc DYNAMIC_LINKER = /lib/ld-uClibc.so.0 endif diff --git a/rules/udev.make b/rules/udev.make index e817c2dbb..ea4460df1 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_UDEV -PACKAGES += udev -endif +PACKAGES-$(PTXCONF_UDEV) += udev # # Paths and names diff --git a/rules/utelnetd.make b/rules/utelnetd.make index e60ed779d..287049e2f 100644 --- a/rules/utelnetd.make +++ b/rules/utelnetd.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_UTELNETD -PACKAGES += utelnetd -endif +PACKAGES-$(PTXCONF_UTELNETD) += utelnetd # # Paths and names diff --git a/rules/util-linux.make b/rules/util-linux.make index b85cbd880..226324b1c 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_UTLNX -PACKAGES += util-linux -endif +PACKAGES-$(PTXCONF_UTLNX) += util-linux # # Paths and names diff --git a/rules/valgrind.make b/rules/valgrind.make index eef8fd9de..5e827964d 100644 --- a/rules/valgrind.make +++ b/rules/valgrind.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_VALGRIND -PACKAGES += valgrind -endif +PACKAGES-$(PTXCONF_VALGRIND) += valgrind # # Paths and names diff --git a/rules/wget.make b/rules/wget.make index 7f99a97d0..a884d1a3d 100644 --- a/rules/wget.make +++ b/rules/wget.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_WGET -PACKAGES += wget -endif +PACKAGES-$(PTXCONF_VALGRIND) += wget # # Paths and names diff --git a/rules/wireless.make b/rules/wireless.make index f45c6adaf..ebb31e8e9 100644 --- a/rules/wireless.make +++ b/rules/wireless.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_WIRELESS -PACKAGES += wireless -endif +PACKAGES-$(PTXCONF_WIRELESS) += wireless # # Paths and names diff --git a/rules/wxWindows.make b/rules/wxWindows.make index a3fe66192..aeae3993b 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_WXWINDOWS_X11 -PACKAGES += wxWindows -endif +PACKAGES-$(PTXCONF_WXWINDOWS_X11) += wxWindows # # Paths and names diff --git a/rules/xalf.make b/rules/xalf.make index c7480d634..f63d11df7 100644 --- a/rules/xalf.make +++ b/rules/xalf.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_XALF -PACKAGES += xalf -endif +PACKAGES-$(PTXCONF_XALF) += xalf # # Paths and names diff --git a/rules/xchain-distcc.make b/rules/xchain-distcc.make index 643c5f2ea..f5dd441dc 100644 --- a/rules/xchain-distcc.make +++ b/rules/xchain-distcc.make @@ -9,12 +9,12 @@ # see the README file. # +# FIXME: rsc: make a host tool + # # We provide this package # -ifdef PTXCONF_XCHAIN-DISTCC -PACKAGES += xchain-distcc -endif +PACKAGES-$(PTXCONF_XCHAIN-DISTCC) += xchain-distcc # # Paths and names diff --git a/rules/xchain-gdb.make b/rules/xchain-gdb.make index 16263de63..fd1af6193 100644 --- a/rules/xchain-gdb.make +++ b/rules/xchain-gdb.make @@ -10,12 +10,12 @@ # see the README file. # +# FIXME: rsc: make a host tool + # # We provide this package # -ifdef PTXCONF_XGDB -PACKAGES += xchain-gdb -endif +PACKAGES-$(PTXCONF_XGDB) += xchain-gdb XCHAIN_GDB_BUILDDIR = $(BUILDDIR)/xchain-$(GDB)-build diff --git a/rules/xchain-kaffe.make b/rules/xchain-kaffe.make index 5b773eb21..df2219aa0 100644 --- a/rules/xchain-kaffe.make +++ b/rules/xchain-kaffe.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_KAFFE -XCHAIN += xchain-kaffe -endif +XCHAIN-$(PTXCONF_KAFFE) += xchain-kaffe # # Paths and names @@ -102,4 +100,4 @@ xchain-kaffe_clean: rm -rf $(STATEDIR)/xchain-kaffe* rm -rf $(XCHAIN_KAFFE_BUILDDIR) -# vim: syntax=make
\ No newline at end of file +# vim: syntax=make diff --git a/rules/xchain-ltt.make b/rules/xchain-ltt.make index 9358517e0..5b93298ec 100644 --- a/rules/xchain-ltt.make +++ b/rules/xchain-ltt.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_LTT -XCHAIN += xchain-ltt -endif +XCHAIN-$(PTXCONF_LTT) += xchain-ltt XCHAIN_LTT_BUILDDIR = $(BUILDDIR)/xchain-$(LTT)-build diff --git a/rules/xchain-nasm.make b/rules/xchain-nasm.make index 9c569fece..6f0a4b437 100644 --- a/rules/xchain-nasm.make +++ b/rules/xchain-nasm.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_NASM -PACKAGES += xchain-nasm -endif +PACKAGES-$(PTXCONF_NASM) += xchain-nasm # # Paths and names diff --git a/rules/xchain-python.make b/rules/xchain-python.make index 97fecc9cc..5dc956c29 100644 --- a/rules/xchain-python.make +++ b/rules/xchain-python.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_KAFFE -XCHAIN += xchain-python -endif +XCHAIN-$(PTXCONF_KAFFE) += xchain-python # # Paths and names @@ -112,4 +110,4 @@ xchain-python_clean: rm -rf $(PYTHON_BUILDDIR) rm -rf $(PYTHON_DIR) -# vim: syntax=make
\ No newline at end of file +# vim: syntax=make diff --git a/rules/xchain-python24.make b/rules/xchain-python24.make index 9d16da8d3..80829ecc7 100644 --- a/rules/xchain-python24.make +++ b/rules/xchain-python24.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_PYTHON24 -XCHAIN += xchain-python24 -endif +XCHAIN-$(PTXCONF_PYTHON24) += xchain-python24 # # Paths and names diff --git a/rules/xchain-scons.make b/rules/xchain-scons.make index 276c3e806..c19cf17fe 100644 --- a/rules/xchain-scons.make +++ b/rules/xchain-scons.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_XCHAIN-SCONS -PACKAGES += xchain-scons -endif +PACKAGES-$(PTXCONF_XCHAIN-SCONS) += xchain-scons # # Paths and names diff --git a/rules/xfree430.make b/rules/xfree430.make index 48a7d0bb3..2587c5b32 100644 --- a/rules/xfree430.make +++ b/rules/xfree430.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XFREE430 -PACKAGES += xfree430 -endif +PACKAGES-$(PTXCONF_XFREE430) += xfree430 # # Paths and names diff --git a/rules/xlibs-damageext.make b/rules/xlibs-damageext.make index 3bb03fa39..0b3da7e64 100644 --- a/rules/xlibs-damageext.make +++ b/rules/xlibs-damageext.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-DAMAGEEXT -PACKAGES += xlibs-damageext -endif +PACKAGES-$(PTXCONF_XLIBS-DAMAGEEXT) += xlibs-damageext # # Paths and names diff --git a/rules/xlibs-fixesext.make b/rules/xlibs-fixesext.make index e56c620d5..106a2b07f 100644 --- a/rules/xlibs-fixesext.make +++ b/rules/xlibs-fixesext.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-FIXESEXT -PACKAGES += xlibs-fixesext -endif +PACKAGES-$(PTXCONF_XLIBS-FIXESEXT) += xlibs-fixesext # # Paths and names diff --git a/rules/xlibs-randr.make b/rules/xlibs-randr.make index 413b6baa2..6098c1e35 100644 --- a/rules/xlibs-randr.make +++ b/rules/xlibs-randr.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-RANDR -PACKAGES += xlibs-randr -endif +PACKAGES-$(PTXCONF_XLIBS-RANDR) += xlibs-randr # # Paths and names diff --git a/rules/xlibs-recordext.make b/rules/xlibs-recordext.make index 929b280ea..0b4509927 100644 --- a/rules/xlibs-recordext.make +++ b/rules/xlibs-recordext.make @@ -14,9 +14,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-RECORDEXT -PACKAGES += xlibs-recordext -endif +PACKAGES-$(PTXCONF_XLIBS-RECORDEXT) += xlibs-recordext # # Paths and names diff --git a/rules/xlibs-render.make b/rules/xlibs-render.make index d3152b34a..45a675b33 100644 --- a/rules/xlibs-render.make +++ b/rules/xlibs-render.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-RENDER -PACKAGES += xlibs-render -endif +PACKAGES-$(PTXCONF_XLIBS-RENDER) += xlibs-render # # Paths and names diff --git a/rules/xlibs-x11.make b/rules/xlibs-x11.make index da5e21900..c12c45453 100644 --- a/rules/xlibs-x11.make +++ b/rules/xlibs-x11.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-X11 -PACKAGES += xlibs-x11 -endif +PACKAGES-$(PTXCONF_XLIBS-X11) += xlibs-x11 # # Paths and names diff --git a/rules/xlibs-xau.make b/rules/xlibs-xau.make index 1da64d3d3..684fdbcd5 100644 --- a/rules/xlibs-xau.make +++ b/rules/xlibs-xau.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XAU -PACKAGES += xlibs-xau -endif +PACKAGES-$(PTXCONF_XLIBS-XAU) += xlibs-xau # # Paths and names diff --git a/rules/xlibs-xext.make b/rules/xlibs-xext.make index 44fd01530..5d4808025 100644 --- a/rules/xlibs-xext.make +++ b/rules/xlibs-xext.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XEXT -PACKAGES += xlibs-xext -endif +PACKAGES-$(PTXCONF_XLIBS-XEXT) += xlibs-xext # # Paths and names diff --git a/rules/xlibs-xextensions.make b/rules/xlibs-xextensions.make index 0f19b77b1..03beecf0c 100644 --- a/rules/xlibs-xextensions.make +++ b/rules/xlibs-xextensions.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XEXTENSIONS -PACKAGES += xlibs-xextensions -endif +PACKAGES-$(PTXCONF_XLIBS-XEXTENSIONS) += xlibs-xextensions # # Paths and names diff --git a/rules/xlibs-xfont.make b/rules/xlibs-xfont.make index 332642396..fc9d1786a 100644 --- a/rules/xlibs-xfont.make +++ b/rules/xlibs-xfont.make @@ -13,9 +13,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XFONT -PACKAGES += xlibs-xfont -endif +PACKAGES-$(PTXCONF_XLIBS-XFONT) += xlibs-xfont # # Paths and names diff --git a/rules/xlibs-xproto.make b/rules/xlibs-xproto.make index fd70cd2c5..0ea9679b8 100644 --- a/rules/xlibs-xproto.make +++ b/rules/xlibs-xproto.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XPROTO -PACKAGES += xlibs-xproto -endif +PACKAGES-$(PTXCONF_XLIBS-XPROTO) += xlibs-xproto # # Paths and names diff --git a/rules/xlibs-xtrans.make b/rules/xlibs-xtrans.make index 59710b7b6..4b87bee28 100644 --- a/rules/xlibs-xtrans.make +++ b/rules/xlibs-xtrans.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XTRANS -PACKAGES += xlibs-xtrans -endif +PACKAGES-$(PTXCONF_XLIBS-XTRANS) += xlibs-xtrans # # Paths and names diff --git a/rules/xlibs-xtst.make b/rules/xlibs-xtst.make index 5f624f823..86fce4c76 100644 --- a/rules/xlibs-xtst.make +++ b/rules/xlibs-xtst.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_XLIBS-XTST -PACKAGES += xlibs-xtst -endif +PACKAGES-$(PTXCONF_XLIBS-XTST) += xlibs-xtst # # Paths and names diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make index 727b10aeb..e970469a3 100644 --- a/rules/xmlstarlet.make +++ b/rules/xmlstarlet.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_XMLSTARLET -PACKAGES += xmlstarlet -endif +PACKAGES-$(PTXCONF_XMLSTARLET) += xmlstarlet # # Paths and names diff --git a/rules/xserver.make b/rules/xserver.make index be0a8f448..95a357791 100644 --- a/rules/xserver.make +++ b/rules/xserver.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_XSERVER -PACKAGES += xserver -endif +PACKAGES-$(PTXCONF_XSERVER) += xserver # # Paths and names diff --git a/rules/xvkbd.make b/rules/xvkbd.make index 6a746dda8..eb88a0b61 100644 --- a/rules/xvkbd.make +++ b/rules/xvkbd.make @@ -12,9 +12,7 @@ # # We provide this package # -ifdef PTXCONF_XVKBD -PACKAGES += xvkbd -endif +PACKAGES-$(PTXCONF_XVKBD) += xvkbd # # Paths and names diff --git a/rules/zebra.make b/rules/zebra.make index 30b79da22..cee54fff4 100644 --- a/rules/zebra.make +++ b/rules/zebra.make @@ -15,9 +15,7 @@ # # We provide this package # -ifdef PTXCONF_ZEBRA -PACKAGES += zebra -endif +PACKAGES-$(PTXCONF_ZEBRA) += zebra # # Paths and names diff --git a/rules/zlib.make b/rules/zlib.make index b3d9a6b2e..46f846bf1 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -11,9 +11,7 @@ # # We provide this package # -ifdef PTXCONF_ZLIB -PACKAGES += zlib -endif +PACKAGES-$(PTXCONF_ZLIB) += zlib # # Paths and names |