summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2013-03-10 14:59:08 +0000
committerMarcus Meissner <marcus@jet.franken.de>2013-03-10 14:59:08 +0000
commit60038db2e4d6672d26c913750d5ffa1fc9570e01 (patch)
tree2e4bc58ddf88c347342e60db1eb6f3458be92b2c /packaging
parentc4026b14fb0078297c43e696325aa98de93ff057 (diff)
downloadlibgphoto2-60038db2e4d6672d26c913750d5ffa1fc9570e01.tar.gz
cleaned up AM_CPPFLAGS and CPPFLAGS usage patterns.
AM_CPPFLAGS and CPPFLAGS are used both during build, so no need to use merge them together in configure. also move the -I$(xx) stuff into Makefile* to avoid shell expansion issues. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14269 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'packaging')
-rw-r--r--packaging/generic/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/generic/Makefile.am b/packaging/generic/Makefile.am
index fefd90979..c9582e041 100644
--- a/packaging/generic/Makefile.am
+++ b/packaging/generic/Makefile.am
@@ -4,6 +4,8 @@ udevscript_SCRIPTS = check-ptp-camera
endif
EXTRA_DIST = check-ptp-camera
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libgphoto2_port -I$(top_srcdir)/libgphoto2 -I$(top_builddir)/libgphoto2
+
print_camera_list_SOURCE = print-camera-list.c
print_camera_list_LDADD = \
$(top_builddir)/libgphoto2/libgphoto2.la \