diff options
| author | wsnipex <wsnipex@a1.net> | 2015-01-03 14:31:02 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2015-01-08 21:59:03 +0100 |
| commit | f73653d62b09db8cab7662ae7c4b2dab596b4ab0 (patch) | |
| tree | a4ba28c9bc510768458040456afebaeab00aed5c /Makefile.in | |
| parent | 145112899a48560df8146376542adfddd3adf79f (diff) | |
[configure] adjust to texturepacker and squish in depends
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index f88c88b558..4151266a44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,9 +9,6 @@ AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@ EC_DIRS= \ tools/EventClients -XBMCTEX_DIRS= \ - tools/TexturePacker - DVDPCODECS_DIRS= \ lib \ lib/libdvd @@ -34,7 +31,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ lib/libRTV/librtv.a \ lib/libXDAAP/libxdaap.a \ lib/libhts/libhts.a \ - lib/libsquish/libsquish.a \ xbmc/addons/addons.a \ xbmc/cdrip/cdrip.a \ xbmc/cores/AudioEngine/audioengine.a \ @@ -352,7 +348,7 @@ config.status: configure # skin textures ifeq (@USE_TEXTUREPACKER@,1) -skins: tools/TexturePacker/TexturePacker force +skins: @TEXTUREPACKER@ $(MAKE) -C $(CONFLUENCE_MEDIA) ifeq (@USE_TOUCH_SKIN@,1) $(MAKE) -C $(TOUCH_SKIN_MEDIA) @@ -460,7 +456,6 @@ externals: codecs libs visualizations screensavers libaddon pvraddons xcode_depends: \ codecs libs visualizations screensavers eventclients skins libaddon \ - lib/libsquish/libsquish.a \ lib/libRTV/librtv.a \ lib/libXDAAP/libxdaap.a \ lib/SlingboxLib/SlingboxLib.a @@ -508,7 +503,7 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC)) BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS)) -DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \ +DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \ $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force @@ -540,9 +535,6 @@ else $(SILENT_LD) $(CC) $(CFLAGS) $(LDFLAGS) -o @APP_NAME_LC@-xrandr xbmc-xrandr.c -lXrandr -lX11 -lm endif -tools/TexturePacker/TexturePacker: xbmc/guilib/XBTF.h - $(MAKE) -C tools/TexturePacker/ - install-bin: @APP_NAME_LC@.bin # developement convenience target sudo install -d $(DESTDIR)$(libdir) @@ -692,8 +684,6 @@ clean-@APP_NAME_LC@.bin: for d in $(BIN_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done clean-eventclients: for d in $(EC_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done -clean-xbmctex: - for d in $(XBMCTEX_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done clean-dvdpcodecs: for d in $(DVDPCODECS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done clean-papcodecs: @@ -713,7 +703,7 @@ endif clean-codecs: clean-dvdpcodecs clean-papcodecs -clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \ +clean-externals: clean-codecs clean-eventclients clean-libs \ clean-screensavers clean-visualisations clean-libaddons clean-pvraddons ifeq (1,@GTEST_CONFIGURED@) |