openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync global Makefile and Makefile.defs from devel branch

Browse Source
This commit is contained in:
Silvan Calarco 2012-03-14 17:59:15 +01:00
parent 28d2b65f7f
commit cef83969fe
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -32,12 +32,12 @@ ifdef PLATFORM
include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile
endif endif
kdelibs: kdelibs3:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \ { echo -n "$@ "; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || \ [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || \
: :
kdelibs4: kdelibs:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \ { echo -n "$@ "; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || \ [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || \

30
Makefile.defs
View File

@ -3,12 +3,13 @@
# libc # libc
libpthread.so.0 = glibc libpthread.so.0 = glibc
ifeq ($(ARCH),i586)
# kernel # kernel
kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
# kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx # kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx
kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-rtl8192se kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl
# kernel-$(KERNEL_EXTRAVER)-atl1e # kernel-$(KERNEL_EXTRAVER)-atl1e kernel-$(KERNEL_EXTRAVER)-rtl8192se
kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
@ -26,8 +27,8 @@ ifdef KERNEL_MORE_EXTRAVER
kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia
# kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx # kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound-backport kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound-backport
kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-rtl8192se kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl
# kernel-$(KERNEL_MORE_EXTRAVER)-atl1e # kernel-$(KERNEL_MORE_EXTRAVER)-rtl8192se kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
kernelfglrx += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-fglrx kernelfglrx += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-fglrx
kernelslmodem += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-softmodems kernelslmodem += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-softmodems
kernelhsfmodem += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-softmodems kernelhsfmodem += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-softmodems
@ -40,7 +41,16 @@ kernelndiswrapper += kernel-$(KERNEL_MORE_EXTRAVER)-ndiswrapper
kernellirc += kernel-$(KERNEL_MORE_EXTRAVER)-lirc kernellirc += kernel-$(KERNEL_MORE_EXTRAVER)-lirc
kernelvboxvideo += kernel-$(KERNEL_MORE_EXTRAVER)-vboxvideo kernelvboxvideo += kernel-$(KERNEL_MORE_EXTRAVER)-vboxvideo
endif endif
endif
ifeq ($(ARCH),arm)
# xorg
xorglibGL = libGL-Mesa-dri
xorglibglx = xorg-ext-libglx
xorgdrvvideo = xorg-drv-video-fbdev xorg-drv-video-tegra
endif
ifeq ($(ARCH),i586)
# xorg # xorg
xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11 xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11
# libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11 # libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11
@ -49,9 +59,10 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
endif
xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev
# xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
libGL.so.1 = libGL-Mesa-dri libGL.so.1 = libGL-Mesa-dri
@ -59,7 +70,11 @@ libGLU.so.1 = libGL-Mesa-dri
splashtheme = splash-theme-openmamba splashtheme = splash-theme-openmamba
ifeq ($(ARCH),i586)
bootloader = syslinux bootloader = syslinux
endif
alsaplayer_output = alsaplayer-output-alsa alsaplayer_output = alsaplayer-output-alsa
#libscanpci.so = xorg-server #libscanpci.so = xorg-server
libgtkpeer.so = libgcj4 libgtkpeer.so = libgcj4
@ -110,6 +125,7 @@ perl[Automake__XFile] = automake
/usr/bin/expectk = expect85-tk /usr/bin/expectk = expect85-tk
/usr/bin/test = coreutils /usr/bin/test = coreutils
/sbin/nologin= util-linux /sbin/nologin= util-linux
/sbin/shutdown = sysvinit
/usr/bin/chfn= pwdutils /usr/bin/chfn= pwdutils
/usr/bin/chsh= pwdutils /usr/bin/chsh= pwdutils
/usr/bin/newgrp= pwdutils /usr/bin/newgrp= pwdutils
@ -125,8 +141,10 @@ perl[Automake__XFile] = automake
/usr/bin/cdrecord = cdrkit /usr/bin/cdrecord = cdrkit
/usr/bin/mkisofs = cdrkit /usr/bin/mkisofs = cdrkit
/usr/bin/readcd = cdrkit /usr/bin/readcd = cdrkit
libgs.so.9 = ghostscript libgs.so.9 = ghostscript
udev = udev
libudev.so.0 = udev
libgudev-1.0.so.0 = udev
# ffmpeg / libav # ffmpeg / libav
libpostproc.so.51 = libpostproc-ffmpeg libpostproc.so.51 = libpostproc-ffmpeg