diff options
| author | elupus <elupus@xbmc.org> | 2011-07-23 20:29:40 +0200 |
|---|---|---|
| committer | elupus <elupus@xbmc.org> | 2011-07-23 20:57:07 +0200 |
| commit | 2e2229a0711af5027e4c3030f58e3e3df0d88ed3 (patch) | |
| tree | 005516231db4436e579734bb4a570eda6882f318 /Makefile.in | |
| parent | afc1bf87b1a4582643ebd8e62ae3943204455a2b (diff) | |
changed: instead of defining multiple rules for dvdplayer, setup a subdir make archive list and use that
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in index 6f821173b2..9b3b6c8a58 100644 --- a/Makefile.in +++ b/Makefile.in @@ -101,6 +101,15 @@ DVDPCODECS_DIRS= \ lib \ lib/libdvd \ +DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \ + xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \ + xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \ + xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \ + xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \ + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \ + xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \ + xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a \ + PAPCODECS_DIRS= \ lib/xbadpcm \ lib/nosefart \ @@ -211,22 +220,8 @@ xbmc/cores/DllLoader/exports/exports.a: force $(MAKE) -C xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util/exports_utils.a: force $(MAKE) -C xbmc/cores/DllLoader/exports/util -xbmc/cores/dvdplayer/DVDPlayer.a: force - $(MAKE) -C xbmc/cores/dvdplayer -xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs -xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Audio -xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Overlay -xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video -xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDDemuxers -xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDInputStreams -xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a: force - $(MAKE) -C xbmc/cores/dvdplayer/DVDSubtitles +$(DVDPLAYER_ARCHIVES): force dvdpcodecs + $(MAKE) -C $(@D) xbmc/cores/paplayer/paplayer.a: force papcodecs $(MAKE) -C xbmc/cores/paplayer xbmc/cores/AudioRenderers/audiorenderers.a: force @@ -438,7 +433,6 @@ OBJSXBMC= \ xbmc/xbmc.a \ xbmc/addons/addons.a \ xbmc/cores/playercorefactory/playercorefactory.a \ - xbmc/cores/dvdplayer/DVDPlayer.a \ xbmc/cores/paplayer/paplayer.a \ xbmc/cores/VideoRenderers/VideoRenderer.a \ xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \ @@ -446,13 +440,7 @@ OBJSXBMC= \ xbmc/cores/cores.a \ xbmc/interfaces/python/python.a \ xbmc/cores/DllLoader/dllloader.a \ - xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \ - xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \ - xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \ - xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \ - xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \ - xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \ - xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a \ + $(DVDPLAYER_ARCHIVES) \ xbmc/cores/AudioRenderers/audiorenderers.a \ xbmc/cores/ExternalPlayer/ExternalPlayer.a \ xbmc/filesystem/filesystem.a \ |