Skip to content
Browse files

Revert "[pvr] Makefile.in cleanups" -> this branch (opdenkamp/master)…

… still includes the pvr add-ons

This reverts commit 4ecd79a.
  • Loading branch information...
1 parent 82a1e3f commit a25581a49fb06e3e75f30292a3be45bab9c56691 @opdenkamp committed Sep 2, 2012
Showing with 23 additions and 10 deletions.
  1. +23 −10 Makefile.in
View
33 Makefile.in
@@ -247,8 +247,8 @@ all : $(FINAL_TARGETS)
include Makefile.include
-.PHONY : dllloader exports visualizations screensavers eventclients papcodecs \
- dvdpcodecs imagelib codecs externals force skins libaddon
+.PHONY : dllloader exports visualizations screensavers eventclients \
+ papcodecs dvdpcodecs imagelib codecs externals force libaddon skins
# hack targets to keep build system up to date
Makefile : config.status $(addsuffix .in, $(AUTOGENERATED_MAKEFILES))
@@ -368,14 +368,19 @@ endif
imagelib: dllloader
$(MAKE) -C lib/cximage-6.0
+pvraddons: exports
+ifeq (@USE_PVR_ADDONS@,1)
+ $(MAKE) -C pvr-addons
+endif
+
codecs: papcodecs dvdpcodecs
libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
-externals: codecs libs visualizations screensavers libaddon
+externals: libaddon codecs libs visualizations screensavers pvraddons
xcode_depends: \
- codecs libs visualizations screensavers eventclients skins libaddon \
+ codecs libs visualizations screensavers eventclients libaddon skins pvraddons \
lib/libsquish/libsquish.a \
lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
@@ -467,23 +472,26 @@ endif
install-arch:
@# Arch dependent files
+ifeq (@USE_PVR_ADDONS@,1)
+ $(MAKE) -C pvr-addons install
+endif
ifeq ($(findstring freebsd,@ARCH@), freebsd)
@find -E system addons -type f -not -iregex ".*svn.*" \
- -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
+ -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs" \
-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
-exec printf " -- %-75.75s\r" "{}" \;
else
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
@find -E system addons -type f -not -iregex ".*svn.*" \
- -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
+ -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*\.pvr" \
-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
-exec printf " -- %-75.75s\r" "{}" \;
else
- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
endif
@@ -508,6 +516,7 @@ install-datas: install-scripts
@# Arch independent files
ifeq ($(findstring bsd,@ARCH@), bsd)
@find -E addons language media sounds userdata system -type f \
+ -not -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
@@ -516,13 +525,13 @@ ifeq ($(findstring bsd,@ARCH@), bsd)
else
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
@find -E addons language media sounds userdata system -type f \
- -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
+ -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr" \
-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
-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"
+ @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
endif
@# Icons and links
@@ -563,11 +572,15 @@ clean-visualisations:
for d in $(VIS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-libaddons:
for d in $(LIBADDON_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
+clean-pvraddons:
+ifeq (@USE_PVR_ADDONS@,1)
+ if test -f pvr-addons/Makefile; then $(MAKE) -C pvr-addons clean; fi;
+endif
clean-codecs: clean-dvdpcodecs clean-papcodecs
clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \
- clean-screensavers clean-visualisations clean-libaddons
+ clean-screensavers clean-visualisations clean-libaddons clean-pvraddons
check:
for d in $(CHECK_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d $@; fi; done

0 comments on commit a25581a

Please sign in to comment.
Something went wrong with that request. Please try again.