From a7c55d3106139e1744a8c9ba1dcfee18b2463ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Mon, 19 Mar 2012 22:58:02 +0000
Subject: [PATCH] sys: sort subdirs in Makefile alphabetically

---
 sys/Makefile.am | 90 ++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 3311cca9c6..879f5f00c9 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -1,19 +1,19 @@
-# if USE_DXR3
-# DXR3_DIR=dxr3
-# else
-# DXR3_DIR=
-# endif
-
-# if USE_QCAM
-# QCAM_DIR=qcam
-# else
-# QCAM_DIR=
-# endif
-
-if USE_VCD
-VCD_DIR=vcd
+if USE_ACM
+ACM_DIR=acmenc acmmp3dec
 else
-VCD_DIR=
+ACM_DIR=
+endif
+
+if USE_APPLE_MEDIA
+APPLE_MEDIA_DIR=applemedia
+else
+APPLE_MEDIA_DIR=
+endif
+
+if USE_AVC
+AVC_DIR=avc
+else
+AVC_DIR=
 endif
 
 # if USE_CDROM
@@ -58,25 +58,42 @@ else
 DVB_DIR=
 endif
 
+# if USE_DXR3
+# DXR3_DIR=dxr3
+# else
+# DXR3_DIR=
+# endif
+
 if USE_LINSYS
 LINSYS_DIR=linsys
 else
 LINSYS_DIR=
 endif
 
-
-if USE_APPLE_MEDIA
-APPLE_MEDIA_DIR=applemedia
-else
-APPLE_MEDIA_DIR=
-endif
-
 if USE_OSX_VIDEO
 OSX_VIDEO_DIR=osxvideo
 else
 OSX_VIDEO_DIR=
 endif
 
+if USE_PVR
+PVR_DIR=pvr2d
+else
+PVR_DIR=
+endif
+
+if USE_SHM
+SHM_DIR=shm
+else
+SHM_DIR=
+endif
+
+# if USE_QCAM
+# QCAM_DIR=qcam
+# else
+# QCAM_DIR=
+# endif
+
 if USE_QUICKTIME
 QT_DIR=qtwrapper
 else
@@ -89,10 +106,10 @@ else
 WININET_DIR=
 endif
 
-if USE_ACM
-ACM_DIR=acmenc acmmp3dec
+if USE_VCD
+VCD_DIR=vcd
 else
-ACM_DIR=
+VCD_DIR=
 endif
 
 if USE_VDPAU
@@ -101,34 +118,15 @@ else
 VDPAU_DIR=
 endif
 
-
-if USE_SHM
-SHM_DIR=shm
-else
-SHM_DIR=
-endif
-
-if USE_AVC
-AVC_DIR=avc
-else
-AVC_DIR=
-endif
-
-if USE_PVR
-PVR_DIR=pvr2d
-else
-PVR_DIR=
-endif
-
 if USE_DIRECT3D9
 WINSCREENCAP_DIR=winscreencap
 else
 WINSCREENCAP_DIR=
 endif
 
-SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(PVR_DIR) $(WINSCREENCAP_DIR)
+SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR)
 
 DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
-		osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap pvr2d
+		osxvideo pvr2d qtwrapper shm vcd vdpau wasapi wininet winks winscreencap
 
 include $(top_srcdir)/common/parallel-subdirs.mak