Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/xbmc/xbmc
Browse files Browse the repository at this point in the history
  • Loading branch information
@axmhari
axmhari committed Oct 26, 2012
2 parents ec823a4 + a70e441 commit 55d48fb
Show file tree
Hide file tree
Showing 1,024 changed files with 21,938 additions and 97,814 deletions.
62 changes: 0 additions & 62 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,14 +355,6 @@ lib/cmyth/Makefile
/lib/pcre/libpcre/Debug
/lib/pcre/libpcre/Release

# /lib/libapetag
/lib/libapetag/Makefile
/lib/libapetag/config.h
/lib/libapetag/install-sh
/lib/libapetag/libtool
/lib/libapetag/m4/lt~obsolete.m4
/lib/libapetag/stamp-h1

# /project
/project/obj
/project/output
Expand Down Expand Up @@ -422,7 +414,6 @@ lib/cmyth/Makefile
/system/librtmp.dll
/system/libexif.dll
/system/libexpat.dll
/system/libid3tag.dll
/system/libidn-11.dll
/system/libssh2.dll
/system/libssl32.dll
Expand Down Expand Up @@ -1067,30 +1058,6 @@ lib/cmyth/Makefile
# /xbmc/music/karaoke/
/xbmc/music/karaoke/Makefile

# /lib/libapetag/
/lib/libapetag/Makefile
/lib/libapetag/libtool
/lib/libapetag/stamp-h1
/lib/libapetag/config.h
/lib/libapetag/Debug
/lib/libapetag/Release
/lib/libapetag/aclocal.m4
/lib/libapetag/config.guess
/lib/libapetag/config.h.in
/lib/libapetag/config.h.in~
/lib/libapetag/config.sub
/lib/libapetag/configure
/lib/libapetag/depcomp
/lib/libapetag/INSTALL
/lib/libapetag/ltmain.sh
/lib/libapetag/m4/libtool.m4
/lib/libapetag/m4/ltoptions.m4
/lib/libapetag/m4/ltsugar.m4
/lib/libapetag/m4/ltversion.m4
/lib/libapetag/m4/lt~obsolete.m4
/lib/libapetag/Makefile.in
/lib/libapetag/missing

# /lib/cmyth/
/lib/cmyth/Makefile.depend
/lib/cmyth/Win32/libcmyth.lib
Expand Down Expand Up @@ -1122,35 +1089,6 @@ lib/cmyth/Makefile
/lib/libhts/Win32/Debug
/lib/libhts/Win32/Release

# /lib/libid3tag/
/lib/libid3tag/Makefile
/lib/libid3tag/libid3tag/autom4te.cache
/lib/libid3tag/libid3tag/configure
/lib/libid3tag/libid3tag/Makefile
/lib/libid3tag/libid3tag/compat.c
/lib/libid3tag/libid3tag/config.h
/lib/libid3tag/libid3tag/frametype.c
/lib/libid3tag/libid3tag/libid3tag.list
/lib/libid3tag/libid3tag/libtool
/lib/libid3tag/libid3tag/stamp-h1
/lib/libid3tag/libid3tag/msvc++/Makefile
/lib/libid3tag/libid3tag/msvc++/libid3tag.lib
/lib/libid3tag/libid3tag/msvc++/Debug
/lib/libid3tag/libid3tag/msvc++/Release
/lib/libid3tag/libid3tag/aclocal.m4
/lib/libid3tag/libid3tag/config.guess
/lib/libid3tag/libid3tag/config.h.in
/lib/libid3tag/libid3tag/config.h.in~
/lib/libid3tag/libid3tag/config.sub
/lib/libid3tag/libid3tag/depcomp
/lib/libid3tag/libid3tag/INSTALL
/lib/libid3tag/libid3tag/install-sh
/lib/libid3tag/libid3tag/ltmain.sh
/lib/libid3tag/libid3tag/Makefile.in
/lib/libid3tag/libid3tag/missing
/lib/libid3tag/libid3tag/mkinstalldirs
/lib/libid3tag/libid3tag/msvc++/Makefile.in


# /xbmc/interfaces/
/xbmc/interfaces/Makefile
Expand Down
20 changes: 3 additions & 17 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include bootstrap.mk

AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@

EC_DIRS= \
Expand Down Expand Up @@ -46,7 +48,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/filesystem/filesystem.a \
xbmc/guilib/guilib.a \
xbmc/input/input.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/interfaces/info/info.a \
xbmc/interfaces/interfaces.a \
xbmc/interfaces/json-rpc/json-rpc.a \
Expand Down Expand Up @@ -179,8 +180,6 @@ LIB_DIRS=\
lib/cximage-6.0 \
lib/libexif \
lib/libhdhomerun \
lib/libid3tag \
lib/libapetag \
lib/cpluff \
lib/xbmc-dll-symbols

Expand Down Expand Up @@ -283,13 +282,6 @@ Makefile : config.status $(addsuffix .in, $(AUTOGENERATED_MAKEFILES))
@echo "done"

config.status: configure
@echo "Build system configuration is stale."
@echo "Please (re)run configure."
@test -n "$$XBMC_IGNORE_STALE"

configure: configure.in
@echo 'configure is outdated, regenerating...'
@./bootstrap

# skin textures
ifeq (@USE_TEXTUREPACKER@,1)
Expand All @@ -312,8 +304,6 @@ $(NWAOBJSXBMC): force
$(DIRECTORY_ARCHIVES): force
@$(MAKE) $(if $(V),,-s) -C $(@D)

lib/libapetag/.libs/libapetag.a: force
$(MAKE) -C lib/libapetag
lib/cpluff/libcpluff/.libs/libcpluff.a: force
$(MAKE) -C lib/cpluff/libcpluff
system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a exports
Expand Down Expand Up @@ -368,8 +358,6 @@ cmyth: dllloader
$(MAKE) -C lib/cmyth
libhdhomerun: dllloader
$(MAKE) -C lib/libhdhomerun
libid3tag: dllloader
$(MAKE) -C lib/libid3tag
papcodecs: dllloader dvdpcodecs
test -d system/players/paplayer || mkdir system/players/paplayer
$(MAKE) -C lib/xbadpcm
Expand Down Expand Up @@ -398,20 +386,18 @@ endif

codecs: papcodecs dvdpcodecs

libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)

externals: codecs libs visualizations screensavers libaddon pvraddons

xcode_depends: \
codecs libs visualizations screensavers eventclients skins libaddon \
lib/libsquish/libsquish.a \
lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
lib/libXDAAP/libxdaap.a \
lib/SlingboxLib/SlingboxLib.a

OBJSXBMC =$(DIRECTORY_ARCHIVES)
OBJSXBMC+=lib/libapetag/.libs/libapetag.a

DYNOBJSXBMC= \
xbmc/linux/linux.a \
Expand Down
Loading

0 comments on commit 55d48fb

Please sign in to comment.