Minor cleanups in platform Makefiles

This commit is contained in:
Silvan Calarco 2012-03-17 17:52:01 +01:00
parent 989fafaadc
commit e29bd233c2
6 changed files with 9 additions and 25 deletions

View File

@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \
ModemManager network-manager-applet Mesa-tools \ ModemManager network-manager-applet Mesa-tools \
x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
xorg-drv-input-mouse xorg-drv-input-void \ xorg-drv-input-mouse xorg-drv-input-void \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart chromium desktop-base-openmamba \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart desktop-base-openmamba \
gdm gnome-session gnome-common gnome-control-center gnome-desktop gnome-desktop-sharp \ gdm gnome-session gnome-common gnome-control-center gnome-desktop gnome-desktop-sharp \
gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-panel gnome-settings-daemon \ gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-panel gnome-settings-daemon \
gnome-sharp gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \ gnome-sharp gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \

View File

@ -1,7 +1,3 @@
$(MAKEDIST_TARGET)-livecd-kde3: kdebase kmix \
kppp krfb ark kcalc kdf kfloppy kgpg klaptop ksnapshot desktop-base-openmamba \
kpdf kontact kmail akregator kitchensync knetworkconf kopete kdebluetooth smb4k knemo \
amarok kaffeine
$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot okular desktop-base-kde4 kmix4 \ ksnapshot okular desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \ kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
@ -22,7 +18,6 @@ $(MAKEDIST_TARGET)-livecd-root: \
samba-server \ samba-server \
ndisgtk smart-gui cpufreqd mambatray \ ndisgtk smart-gui cpufreqd mambatray \
$(MAKEDIST_TARGET)-livecd-kde4 $(MAKEDIST_TARGET)-livecd-kde4
# gnome-device-manager
# libopensync-plugin-syncml libopensync-plugin-google-calendar \ # libopensync-plugin-syncml libopensync-plugin-google-calendar \
# libopensync-plugin-gnokii libopensync-plugin-synce \ # libopensync-plugin-gnokii libopensync-plugin-synce \
# libopensync-plugin-moto libopensync-plugin-palm \ # libopensync-plugin-moto libopensync-plugin-palm \

View File

@ -1,8 +1,4 @@
$(MAKEDIST_TARGET)-livedvd-kde3: kdebase kmix \ $(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
kppp krfb ksirc ark kcalc kdf kfloppy kgpg klaptop ksnapshot desktop-base-openmamba \
kpdf kontact kmail akregator kitchensync knetworkconf kopete kdebluetooth smb4k knemo \
amarok kaffeine
$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \ kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \
kaffeine libqt4-sqlite kate kaffeine libqt4-sqlite kate
@ -19,9 +15,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \
gparted gag ntfs-3g libdvdcss \ gparted gag ntfs-3g libdvdcss \
chromium totem-mozilla-plugin \ chromium totem-mozilla-plugin \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk samba-server \
gnome-device-manager \
samba-server \
ndisgtk smart-gui cpufreqd mambatray \ ndisgtk smart-gui cpufreqd mambatray \
$(MAKEDIST_TARGET)-livedvd-kde4 toptray testdisk photorec $(MAKEDIST_TARGET)-livedvd-kde4 toptray testdisk photorec
# libopensync-plugin-syncml libopensync-plugin-google-calendar \ # libopensync-plugin-syncml libopensync-plugin-google-calendar \

View File

@ -1,4 +1,4 @@
$(MAKEDIST_TARGET)-livegames-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livegames-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k kate \ kopete4 kdebluetooth4 smb4k kate \
kruler gwenview4 kamera kcolorchooser lisa4 kwalletmanager4 libqt4-sqlite \ kruler gwenview4 kamera kcolorchooser lisa4 kwalletmanager4 libqt4-sqlite \
@ -18,11 +18,11 @@ $(MAKEDIST_TARGET)-livegames-root: \
chromium totem-mozilla-plugin \ chromium totem-mozilla-plugin \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
kdebluetooth Mesa-tools driconf \ kdebluetooth Mesa-tools driconf \
gnome-device-manager desktop-base-openmamba \ desktop-base-openmamba \
extremetuxracer ksudoku4 okular cpufreqd mambatray \ extremetuxracer ksudoku4 okular cpufreqd mambatray \
pingus gnuchess powermanga FlightGear frozen-bubble \ pingus gnuchess powermanga FlightGear frozen-bubble \
monkey-bubble pathological neverball \ monkey-bubble pathological neverball \
tuxkart gtans ksirk moagg knights \ tuxkart gtans moagg knights \
torcs xmame openarena ndisgtk smart-gui \ torcs xmame openarena ndisgtk smart-gui \
enemy-territory-client enemy-territory-etpro \ enemy-territory-client enemy-territory-etpro \
enemy-territory-server enemy-territory-server-etpro \ enemy-territory-server enemy-territory-server-etpro \

View File

@ -1,4 +1,4 @@
$(MAKEDIST_TARGET)-livestudio-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livestudio-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k kate \ kopete4 kdebluetooth4 smb4k kate \
kruler gwenview4 kamera kcolorchooser amarok lisa4 kwalletmanager4 libqt4-sqlite kruler gwenview4 kamera kcolorchooser amarok lisa4 kwalletmanager4 libqt4-sqlite
@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-livestudio-root: \
audacity \ audacity \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf \ Mesa-tools driconf \
gnome-device-manager blender inkscape ardour \ blender inkscape ardour \
mixxx lives muse puredata \ mixxx lives muse puredata \
qtractor rosegarden ZynAddSubFX timidity \ qtractor rosegarden ZynAddSubFX timidity \
qsynth qjackctl kino hydrogen vlc digikam \ qsynth qjackctl kino hydrogen vlc digikam \

View File

@ -1,8 +1,4 @@
$(MAKEDIST_TARGET)-testcd-kde3: kdebase kmix \ $(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
kppp krfb ksirc ark kcalc kdf kfloppy kgpg klaptop ksnapshot desktop-base-openmamba \
kpdf kontact kmail akregator kitchensync knetworkconf kopete kdebluetooth smb4k knemo \
amarok kaffeine
$(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \ kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
kaffeine libqt4-sqlite kate kaffeine libqt4-sqlite kate
@ -23,7 +19,6 @@ $(MAKEDIST_TARGET)-testcd-root: \
samba-server \ samba-server \
ndisgtk smart-gui cpufreqd mambatray \ ndisgtk smart-gui cpufreqd mambatray \
$(MAKEDIST_TARGET)-testcd-kde4 openssh-server $(MAKEDIST_TARGET)-testcd-kde4 openssh-server
# gnome-device-manager
# libopensync-plugin-syncml libopensync-plugin-google-calendar \ # libopensync-plugin-syncml libopensync-plugin-google-calendar \
# libopensync-plugin-gnokii libopensync-plugin-synce \ # libopensync-plugin-gnokii libopensync-plugin-synce \
# libopensync-plugin-moto libopensync-plugin-palm \ # libopensync-plugin-moto libopensync-plugin-palm \