|
|
@ -1,33 +1,33 @@ |
|
|
|
Index: libgphoto2-2.5.13/Makefile.am
|
|
|
|
Index: libgphoto2-2.5.14/Makefile.am
|
|
|
|
===================================================================
|
|
|
|
--- libgphoto2-2.5.13.orig/Makefile.am
|
|
|
|
+++ libgphoto2-2.5.13/Makefile.am
|
|
|
|
--- libgphoto2-2.5.14.orig/Makefile.am
|
|
|
|
+++ libgphoto2-2.5.14/Makefile.am
|
|
|
|
@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config
|
|
|
|
EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk |
|
|
|
|
|
|
|
|
|
|
|
# Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() |
|
|
|
-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4
|
|
|
|
+SUBDIRS = @subdirs@ libgphoto2 camlibs packaging gphoto-m4
|
|
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += libgphoto2.pc.in |
|
|
|
pkgconfig_DATA = libgphoto2.pc |
|
|
|
Index: libgphoto2-2.5.13/Makefile.in
|
|
|
|
Index: libgphoto2-2.5.14/Makefile.in
|
|
|
|
===================================================================
|
|
|
|
--- libgphoto2-2.5.13.orig/Makefile.in
|
|
|
|
+++ libgphoto2-2.5.13/Makefile.in
|
|
|
|
--- libgphoto2-2.5.14.orig/Makefile.in
|
|
|
|
+++ libgphoto2-2.5.14/Makefile.in
|
|
|
|
@@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
|
|
|
|
INSTALL README.in README README.packaging |
|
|
|
|
|
|
|
|
|
|
|
# Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() |
|
|
|
-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4
|
|
|
|
+SUBDIRS = @subdirs@ libgphoto2 camlibs packaging gphoto-m4
|
|
|
|
pkgconfig_DATA = libgphoto2.pc |
|
|
|
noinst_DATA = libgphoto2-uninstalled.pc |
|
|
|
doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ |
|
|
|
Index: libgphoto2-2.5.13/configure.ac
|
|
|
|
Index: libgphoto2-2.5.14/configure.ac
|
|
|
|
===================================================================
|
|
|
|
--- libgphoto2-2.5.13.orig/configure.ac
|
|
|
|
+++ libgphoto2-2.5.13/configure.ac
|
|
|
|
--- libgphoto2-2.5.14.orig/configure.ac
|
|
|
|
+++ libgphoto2-2.5.14/configure.ac
|
|
|
|
@@ -635,20 +635,11 @@ gphoto-m4/Makefile
|
|
|
|
libgphoto2/Makefile |
|
|
|
libgphoto2.pc |
|
|
@ -49,36 +49,36 @@ Index: libgphoto2-2.5.13/configure.ac |
|
|
|
],[ |
|
|
|
dnl This relies on this code being called for each of the above files |
|
|
|
dnl with ac_file set to the filename. |
|
|
|
Index: libgphoto2-2.5.13/libgphoto2_port/Makefile.am
|
|
|
|
Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.am
|
|
|
|
===================================================================
|
|
|
|
--- libgphoto2-2.5.13.orig/libgphoto2_port/Makefile.am
|
|
|
|
+++ libgphoto2-2.5.13/libgphoto2_port/Makefile.am
|
|
|
|
--- libgphoto2-2.5.14.orig/libgphoto2_port/Makefile.am
|
|
|
|
+++ libgphoto2-2.5.14/libgphoto2_port/Makefile.am
|
|
|
|
@@ -25,7 +25,7 @@ udevscript_PROGRAMS =
|
|
|
|
bin_SCRIPTS = gphoto2-port-config |
|
|
|
|
|
|
|
|
|
|
|
# The . stands for the current dir, i.e. the iolibs to build. |
|
|
|
-SUBDIRS = po libgphoto2_port test . doc gphoto-m4
|
|
|
|
+SUBDIRS = libgphoto2_port . gphoto-m4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
######################################################################## |
|
|
|
Index: libgphoto2-2.5.13/libgphoto2_port/Makefile.in
|
|
|
|
Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.in
|
|
|
|
===================================================================
|
|
|
|
--- libgphoto2-2.5.13.orig/libgphoto2_port/Makefile.in
|
|
|
|
+++ libgphoto2-2.5.13/libgphoto2_port/Makefile.in
|
|
|
|
--- libgphoto2-2.5.14.orig/libgphoto2_port/Makefile.in
|
|
|
|
+++ libgphoto2-2.5.14/libgphoto2_port/Makefile.in
|
|
|
|
@@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser
|
|
|
|
bin_SCRIPTS = gphoto2-port-config |
|
|
|
|
|
|
|
|
|
|
|
# The . stands for the current dir, i.e. the iolibs to build. |
|
|
|
-SUBDIRS = po libgphoto2_port test . doc gphoto-m4
|
|
|
|
+SUBDIRS = libgphoto2_port . gphoto-m4
|
|
|
|
|
|
|
|
|
|
|
|
######################################################################## |
|
|
|
# All iolibs are defined as EXTRA_LTLIBRARIES. This requires that |
|
|
|
Index: libgphoto2-2.5.13/libgphoto2_port/configure.ac
|
|
|
|
Index: libgphoto2-2.5.14/libgphoto2_port/configure.ac
|
|
|
|
===================================================================
|
|
|
|
--- libgphoto2-2.5.13.orig/libgphoto2_port/configure.ac
|
|
|
|
+++ libgphoto2-2.5.13/libgphoto2_port/configure.ac
|
|
|
|
--- libgphoto2-2.5.14.orig/libgphoto2_port/configure.ac
|
|
|
|
+++ libgphoto2-2.5.14/libgphoto2_port/configure.ac
|
|
|
|
@@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS])
|
|
|
|
# --------------------------------------------------------------------------- |
|
|
|
AC_CONFIG_FILES([ |
|
|
|