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.

83 lines
2.6 KiB

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