diff options
author | Stephan Raue <stephan@openelec.tv> | 2011-08-09 06:30:31 +0200 |
---|---|---|
committer | Stephan Raue <stephan@openelec.tv> | 2011-08-09 06:30:31 +0200 |
commit | 1d9a8e099595ec723b3b897d6bb02d6bf9e1ed8d (patch) | |
tree | 9dbe46b9ad68c825cb773ece34fd6dad21be34f7 /Makefile.in | |
parent | 5c5a6e0959d1c8ca5307132c3dd1dae26d79d5dc (diff) |
Makefile.in: fix build after 1bfd337b688c0f2b099afe8ff7ea98af9ead9776. Remove unneeded backslashes. Remove unneeded whitespaces.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/Makefile.in b/Makefile.in index 351715d79f..be9283243e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,7 +45,7 @@ BIN_DIRS= \ xbmc/network/osx \ xbmc/playlists \ xbmc/powermanagement \ - xbmc/powermanagement/linux \ + xbmc/powermanagement/linux \ xbmc/rendering \ xbmc/storage \ xbmc/storage/linux \ @@ -73,7 +73,7 @@ BIN_DIRS= \ xbmc/input/linux \ xbmc/osx \ xbmc/threads \ - xbmc/windowing \ + xbmc/windowing ifeq (@USE_OPENGL@,1) BIN_DIRS += xbmc/rendering/gl @@ -100,7 +100,7 @@ XBMCTEX_DIRS= \ DVDPCODECS_DIRS= \ lib \ - lib/libdvd \ + lib/libdvd DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \ xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \ @@ -109,7 +109,7 @@ DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.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 \ + xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a PAPCODECS_DIRS= \ lib/xbadpcm \ @@ -118,7 +118,7 @@ PAPCODECS_DIRS= \ lib/libsidplay2 \ lib/stsound/StSoundLibrary \ lib/snesapu/SNES/SNESAPU \ - lib/vgmstream \ + lib/vgmstream ifeq (@USE_ASAP_CODEC@,1) PAPCODECS_DIRS+= \ @@ -137,7 +137,7 @@ LIB_DIRS=\ SS_DIRS= ifeq (@USE_OPENGL@,1) -SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc + SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc endif VIS_DIRS= @@ -145,21 +145,21 @@ ifeq (@USE_OPENGL@,1) VIS_DIRS+=\ xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/WaveForm \ - xbmc/visualizations/XBMCProjectM \ - + xbmc/visualizations/XBMCProjectM endif -ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1)) -VIS_DIRS+=xbmc/visualizations/iTunes \ +ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1)) + VIS_DIRS+=xbmc/visualizations/iTunes endif -ifneq (@DISABLE_GOOM@,1) -VIS_DIRS+=xbmc/visualizations/Goom \ +ifneq (@DISABLE_GOOM@,1) + VIS_DIRS+=xbmc/visualizations/Goom endif + ifeq (@USE_OPENGLES@,1) ifeq ($(findstring osx,@ARCH@), osx) ifeq (@ARCH@, arm-osx) - VIS_DIRS+=xbmc/visualizations/EGLSpectrum \ + VIS_DIRS+=xbmc/visualizations/EGLSpectrum endif endif endif @@ -489,8 +489,8 @@ OBJSXBMC= \ lib/SlingboxLib/SlingboxLib.a \ lib/libapetag/.libs/libapetag.a \ lib/xbmc-dll-symbols/dll-symbols.a \ - xbmc/rendering/rendering.a \ - xbmc/windowing/windowing.a \ + xbmc/rendering/rendering.a \ + xbmc/windowing/windowing.a ifeq (@USE_OPENGL@,1) OBJSXBMC+= \ @@ -518,8 +518,7 @@ OBJSXBMC += \ xbmc/powermanagement/osx/powermanagement.a \ xbmc/network/osx/network.a \ xbmc/storage/osx/storage.a \ - xbmc/network/linux/network_linux.a \ - + xbmc/network/linux/network_linux.a else OBJSXBMC += \ xbmc/input/linux/input_linux.a \ @@ -557,7 +556,7 @@ ifneq (1,@USE_XRANDR@) # xbmc-xrandr.c gets picked up by the default make rules @echo "excluding xbmc-xrandr" else - $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11 endif tools/XBMCTex/XBMCTex: @@ -631,7 +630,7 @@ ifeq ($(findstring bsd,@ARCH@), bsd) -exec printf " -- %-75.75s\r" "{}" \; else @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" -endif +endif @# Icons and links @install -d $(DESTDIR)$(datarootdir)/applications @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop @@ -673,7 +672,7 @@ reallyclean: echo " The following files may need reverted (svn revert <file>)"; \ svn st | sed -e "s/^M */ /p" -e d; \ else \ - echo; \ + echo; \ fi clean-xbmc.bin: @@ -698,5 +697,3 @@ clean-codecs: clean-dvdpcodecs clean-papcodecs clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \ clean-screensavers clean-visualisations - - |