patch-Makefile_in 5.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110
  1. --- xbmc-16.0-Jarvis.orig/Makefile.in 2016-02-20 16:21:19.000000000 +0100
  2. +++ xbmc-16.0-Jarvis/Makefile.in 2016-04-08 13:41:57.000000000 +0200
  3. @@ -314,17 +314,9 @@ $(DVDPLAYER_ARCHIVES) : dvdpcode
  4. lib/cpluff/libcpluff/.libs/libcpluff.a: force
  5. $(MAKE) -C lib/cpluff/libcpluff
  6. system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a exports
  7. -ifeq ($(findstring osx,@ARCH@), osx)
  8. - ifeq (@ARCH@, arm-osx)
  9. - $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ $<
  10. - else
  11. - $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -lexpat $(BUNDLE1_O) -o $@ $<
  12. - endif
  13. -else
  14. $(CXX) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $< \
  15. -Wl,--no-whole-archive \
  16. `cat xbmc/cores/DllLoader/exports/wrapper.def` xbmc/cores/DllLoader/exports/wrapper.o -lexpat
  17. -endif
  18. exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/util/exports_utils.a
  19. $(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def
  20. @@ -348,13 +340,8 @@ dvdpextcodecs:
  21. endif
  22. eventclients:
  23. -ifeq ($(findstring osx,@ARCH@), osx)
  24. -ifneq ($(findstring arm,@ARCH@), arm)
  25. - $(MAKE) -C tools/EventClients/Clients/OSXRemote
  26. -endif
  27. -else
  28. $(MAKE) -C tools/EventClients
  29. -endif
  30. +
  31. libexif: dllloader
  32. $(MAKE) -C lib/libexif
  33. @@ -423,19 +410,10 @@ $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(M
  34. include xbmc/addons/addon-bindings.mk
  35. lib@APP_NAME_LC@.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
  36. -ifeq ($(findstring osx,@ARCH@), osx)
  37. - $(SILENT_LD) $(CXX) $(LDFLAGS) -bundle -o $@ $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -read_only_relocs suppress
  38. -else
  39. $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $(MAINOBJS) -Wl,--no-whole-archive,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS) -Wl,-Bsymbolic
  40. -endif
  41. @APP_NAME_LC@.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
  42. -
  43. -ifeq ($(findstring osx,@ARCH@), osx)
  44. - $(SILENT_LD) $(CXX) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
  45. -else
  46. - $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
  47. -endif
  48. + $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
  49. @APP_NAME_LC@-xrandr: xbmc-xrandr.c
  50. ifneq (1,@USE_X11@)
  51. @@ -450,9 +428,6 @@ install-bin: @APP_NAME_LC@.bin # develop
  52. sudo install -d $(DESTDIR)$(libdir)
  53. sudo install @APP_NAME_LC@.bin $(DESTDIR)$(libdir)/@APP_NAME_LC@
  54. -ifeq ($(findstring osx,@ARCH@), osx)
  55. - # TODO: add osx install
  56. -else
  57. install: install-binaries install-arch install-datas
  58. apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb: install
  59. @@ -474,30 +449,11 @@ else
  60. @install @APP_NAME_LC@.bin $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@.bin
  61. @echo "You can run @APP_NAME_LC@ with the command '@APP_NAME_LC@'"
  62. endif
  63. -endif
  64. install-arch:
  65. @# Arch dependent files
  66. -ifeq ($(findstring freebsd,@ARCH@), freebsd)
  67. - @find -E system addons -type f -not -iregex ".*\.git.*" \
  68. - -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
  69. - -exec sh -c "install -d \"$(DESTDIR)$(libdir)/@APP_NAME_LC@/\`dirname '{}'\`\"" \; \
  70. - -and \
  71. - -exec install "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; \
  72. - -exec printf " -- %-75.75s\r" "{}" \;
  73. -else
  74. -ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
  75. - @find -E system addons -type f -not -iregex ".*\.git.*" \
  76. - -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
  77. - -exec sh -c "install -d \"$(DESTDIR)$(libdir)/@APP_NAME_LC@/\`dirname '{}'\`\"" \; \
  78. - -and \
  79. - -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
  80. - -exec printf " -- %-75.75s\r" "{}" \;
  81. -else
  82. @find system addons -regextype posix-extended -type f -not -iregex ".*\.git.*" -iregex ".*\.so|.*\.so\.[0-9].*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r"
  83. @find -L addons -regextype posix-extended -type f -not -iregex ".*\.git.*" -iregex ".*\.so|.*\.so\.[0-9].*" -exec cp -d "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r"
  84. -endif
  85. -endif
  86. install-scripts:
  87. @install -d $(DESTDIR)$(bindir)
  88. @@ -620,11 +576,7 @@ $(CHECK_LIBS): force
  89. @$(MAKE) CXXFLAGS="$(CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1" $(if $(V),,-s) -C $(@D)
  90. @APP_NAME_LC@-test: $(CHECK_LIBS) $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(GTEST_LIBS)
  91. -ifeq ($(findstring osx,@ARCH@), osx)
  92. - $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(GTEST_INCLUDES) -o $@ -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(GTEST_LIBS) $(CHECK_LIBS) $(LIBS) $(CHECK_LIBADD) -rdynamic
  93. -else
  94. - $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(GTEST_INCLUDES) -o $@ -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) $(GTEST_LIBS) $(CHECK_LIBS) -Wl,--no-whole-archive $(NWAOBJSXBMC) $(LIBS) $(CHECK_LIBADD) -rdynamic
  95. -endif
  96. + $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(GTEST_INCLUDES) -o $@ -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) $(GTEST_LIBS) $(CHECK_LIBS) -Wl,--no-whole-archive $(NWAOBJSXBMC) $(LIBS) $(CHECK_LIBADD)
  97. else
  98. # Give a message that the framework is not configured, but don't fail.
  99. check testsuite testframework: