You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

95 lines
3.5 KiB

  1. Index: libgphoto2-2.5.17/Makefile.am
  2. ===================================================================
  3. --- libgphoto2-2.5.17.orig/Makefile.am
  4. +++ libgphoto2-2.5.17/Makefile.am
  5. @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config
  6. EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk
  7. # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
  8. -SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4
  9. +SUBDIRS = @subdirs@ libgphoto2 camlibs packaging gphoto-m4
  10. EXTRA_DIST += libgphoto2.pc.in
  11. pkgconfig_DATA = libgphoto2.pc
  12. Index: libgphoto2-2.5.17/Makefile.in
  13. ===================================================================
  14. --- libgphoto2-2.5.17.orig/Makefile.in
  15. +++ libgphoto2-2.5.17/Makefile.in
  16. @@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
  17. INSTALL README.in README README.packaging
  18. # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
  19. -SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4
  20. +SUBDIRS = @subdirs@ libgphoto2 camlibs packaging gphoto-m4
  21. pkgconfig_DATA = libgphoto2.pc
  22. noinst_DATA = libgphoto2-uninstalled.pc
  23. doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \
  24. Index: libgphoto2-2.5.17/configure.ac
  25. ===================================================================
  26. --- libgphoto2-2.5.17.orig/configure.ac
  27. +++ libgphoto2-2.5.17/configure.ac
  28. @@ -635,20 +635,11 @@ gphoto-m4/Makefile
  29. libgphoto2/Makefile
  30. libgphoto2.pc
  31. libgphoto2-uninstalled.pc
  32. -examples/Makefile
  33. -tests/Makefile
  34. -tests/ddb/Makefile
  35. -tests/ddb/check-ddb.sh
  36. packaging/Makefile
  37. packaging/linux-hotplug/Makefile
  38. packaging/generic/Makefile
  39. packaging/rpm/Makefile
  40. packaging/rpm/package.spec
  41. -po/Makefile.in
  42. -doc/Makefile
  43. -doc/Doxyfile
  44. -doc/Doxyfile-internals
  45. -doc/api/Makefile
  46. ],[
  47. dnl This relies on this code being called for each of the above files
  48. dnl with ac_file set to the filename.
  49. Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.am
  50. ===================================================================
  51. --- libgphoto2-2.5.17.orig/libgphoto2_port/Makefile.am
  52. +++ libgphoto2-2.5.17/libgphoto2_port/Makefile.am
  53. @@ -25,7 +25,7 @@ udevscript_PROGRAMS =
  54. bin_SCRIPTS = gphoto2-port-config
  55. # The . stands for the current dir, i.e. the iolibs to build.
  56. -SUBDIRS = po libgphoto2_port test . doc gphoto-m4
  57. +SUBDIRS = libgphoto2_port . gphoto-m4
  58. ########################################################################
  59. Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.in
  60. ===================================================================
  61. --- libgphoto2-2.5.17.orig/libgphoto2_port/Makefile.in
  62. +++ libgphoto2-2.5.17/libgphoto2_port/Makefile.in
  63. @@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser
  64. bin_SCRIPTS = gphoto2-port-config
  65. # The . stands for the current dir, i.e. the iolibs to build.
  66. -SUBDIRS = po libgphoto2_port test . doc gphoto-m4
  67. +SUBDIRS = libgphoto2_port . gphoto-m4
  68. ########################################################################
  69. # All iolibs are defined as EXTRA_LTLIBRARIES. This requires that
  70. Index: libgphoto2-2.5.17/libgphoto2_port/configure.ac
  71. ===================================================================
  72. --- libgphoto2-2.5.17.orig/libgphoto2_port/configure.ac
  73. +++ libgphoto2-2.5.17/libgphoto2_port/configure.ac
  74. @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS])
  75. # ---------------------------------------------------------------------------
  76. AC_CONFIG_FILES([
  77. Makefile
  78. -po/Makefile.in
  79. libgphoto2_port/Makefile
  80. libgphoto2_port.pc
  81. libgphoto2_port-uninstalled.pc
  82. gphoto2-port-config
  83. -test/Makefile
  84. -doc/Makefile
  85. gphoto-m4/Makefile
  86. ])
  87. AC_OUTPUT