diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-19 22:58:02 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-19 22:58:02 +0000 |
| commit | a7c55d3106139e1744a8c9ba1dcfee18b2463ca2 (patch) | |
| tree | 3aa78e64d9076fce50aee40ee50b050d8891ce75 /sys | |
| parent | ae471142eb838833b4f2db1c2abdfd45e7b3c579 (diff) | |
| download | gstreamer-plugins-bad-a7c55d3106139e1744a8c9ba1dcfee18b2463ca2.tar.gz | |
sys: sort subdirs in Makefile alphabetically
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/Makefile.am | 84 |
1 files changed, 41 insertions, 43 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 3311cca9c..879f5f00c 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_ACM +ACM_DIR=acmenc acmmp3dec +else +ACM_DIR= +endif -# if USE_QCAM -# QCAM_DIR=qcam -# else -# QCAM_DIR= -# endif +if USE_APPLE_MEDIA +APPLE_MEDIA_DIR=applemedia +else +APPLE_MEDIA_DIR= +endif -if USE_VCD -VCD_DIR=vcd +if USE_AVC +AVC_DIR=avc else -VCD_DIR= +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_OSX_VIDEO +OSX_VIDEO_DIR=osxvideo +else +OSX_VIDEO_DIR= +endif -if USE_APPLE_MEDIA -APPLE_MEDIA_DIR=applemedia +if USE_PVR +PVR_DIR=pvr2d else -APPLE_MEDIA_DIR= +PVR_DIR= endif -if USE_OSX_VIDEO -OSX_VIDEO_DIR=osxvideo +if USE_SHM +SHM_DIR=shm else -OSX_VIDEO_DIR= +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 |