diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-06-03 14:42:06 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-06-03 15:27:43 -0400 |
| commit | 21686e30779b225e903fb7a6e90e9c5a81c7c9d0 (patch) | |
| tree | c51039c8d942a59f72cebafffde6f6dffffc8d10 /sys/Makefile.am | |
| parent | 536e79befd17d62aba4eaa6308fef6128dd5fa09 (diff) | |
| download | gstreamer-plugins-bad-21686e30779b225e903fb7a6e90e9c5a81c7c9d0.tar.gz | |
shm: Move to sys/ since it doesn't exist on windows
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index bbfffcd11..c94df0d44 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -76,9 +76,15 @@ else VDPAU_DIR= endif -SUBDIRS = $(ACM_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) +if USE_SHM +SHM_DIR=shm +else +SHM_DIR= +endif + +SUBDIRS = $(ACM_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) DIST_SUBDIRS = acmenc acmmp3dec directdraw directsound dvb fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ - osxvideo qtwrapper vcd vdpau wasapi wininet winks winscreencap + osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap include $(top_srcdir)/common/parallel-subdirs.mak |