remove redundant INCLUDE = definitions from Makefile.am

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7830 67ed7778-7388-44ab-90cf-0a291f65f57c
author: Hans Ulrich Niedermann <gp@n-dimensional.de> 2005-04-14 18:32:57 +0000
committer: Hans Ulrich Niedermann <gp@n-dimensional.de> 2005-04-14 18:32:57 +0000
commit: 39ed60337fc958a8726dabbcba30ae0da33fb923 (patch)
tree: 47410340802361aad88a118ee80c931f1ad476d5 /camlibs
parent: 898ff8fe4b241da50a8b3dcbca80acf99e445694 (diff)
download: libgphoto2-39ed60337fc958a8726dabbcba30ae0da33fb923.tar.gz
47 files changed, 8 insertions, 277 deletions
diff --git a/camlibs/adc65/Makefile.am b/camlibs/adc65/Makefile.am
index 6994389b3..284df53a2 100644
--- a/camlibs/adc65/Makefile.am
+++ b/camlibs/adc65/Makefile.am
@@ -1,11 +1,6 @@
 camlib_LTLIBRARIES = libgphoto2_adc65.la
 EXTRA_DIST = README TODO Changelog
 
-INCLUDES =						\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_adc65_la_SOURCES = adc65.c adc65.h library.c
 libgphoto2_adc65_la_LDFLAGS = -module -avoid-version
 libgphoto2_adc65_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/agfa-cl20/Makefile.am b/camlibs/agfa-cl20/Makefile.am
index d2965538a..c9efc014a 100644
--- a/camlibs/agfa-cl20/Makefile.am
+++ b/camlibs/agfa-cl20/Makefile.am
@@ -1,10 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_agfa_cl20.la
 
-INCLUDES =                                              \
-	-I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)/libgphoto2
-
 EXTRA_DIST = README STATUS ChangeLog protocol.txt protocol2.txt commands.txt \
 	pic-header.txt RANDOM
 
diff --git a/camlibs/aox/Makefile.am b/camlibs/aox/Makefile.am
index ba9516acb..819a547ef 100644
--- a/camlibs/aox/Makefile.am
+++ b/camlibs/aox/Makefile.am
@@ -1,13 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_aox.la
 
-INCLUDES =                              		\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port			\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)					\
-	-I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_aox_la_SOURCES = library.c aox.c aox.h
 libgphoto2_aox_la_LDFLAGS = -module -avoid-version
 libgphoto2_aox_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am
index eddc5cd88..5007509ee 100644
--- a/camlibs/barbie/Makefile.am
+++ b/camlibs/barbie/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = barbie.df makefile.os2 main.c compile
 
 camlib_LTLIBRARIES = libgphoto2_barbie.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_barbie_la_SOURCES = barbie.c barbie.h library.c library.h
 libgphoto2_barbie_la_LDFLAGS = -module -avoid-version
 libgphoto2_barbie_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am
index f29b3cedf..0bd67d7f5 100644
--- a/camlibs/canon/Makefile.am
+++ b/camlibs/canon/Makefile.am
@@ -4,12 +4,6 @@ EXTRA_DIST = .indent.pro canon.df makefile.os2 ChangeLog urb-interpret
 
 camlib_LTLIBRARIES = libgphoto2_canon.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_canon_la_SOURCES =\
  canon.c canon.h\
  library.c library.h\
diff --git a/camlibs/casio/Makefile.am b/camlibs/casio/Makefile.am
index 8f5343d35..1c823dce7 100644
--- a/camlibs/casio/Makefile.am
+++ b/camlibs/casio/Makefile.am
@@ -1,11 +1,6 @@
 camlib_LTLIBRARIES = libgphoto2_casio_qv.la
 EXTRA_DIST = PROTOCOL.txt
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_casio_qv_la_SOURCES =		\
 	casio-qv.c				\
 	casio-qv-commands.c casio-qv-commands.h \
diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am
index 20f9b97f5..41f370dca 100644
--- a/camlibs/digita/Makefile.am
+++ b/camlibs/digita/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = digita.df makefile.os2
 
 camlib_LTLIBRARIES = libgphoto2_digita.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_digita_la_SOURCES = digita.c serial.c usb.c commands.c digita.h
 libgphoto2_digita_la_LDFLAGS = -module -avoid-version
 libgphoto2_digita_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/dimera/Makefile.am b/camlibs/dimera/Makefile.am
index 489151d97..10c1b5821 100644
--- a/camlibs/dimera/Makefile.am
+++ b/camlibs/dimera/Makefile.am
@@ -2,12 +2,6 @@ EXTRA_DIST = dimera.df makefile.os2 CREDITS Protocol.txt
 
 camlib_LTLIBRARIES = libgphoto2_dimera3500.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_dimera3500_la_SOURCES =\
  dimera3500.c \
  mesalib.c mesalib.h\
diff --git a/camlibs/directory/Makefile.am b/camlibs/directory/Makefile.am
index 8833c92a0..8ffb3f0fb 100644
--- a/camlibs/directory/Makefile.am
+++ b/camlibs/directory/Makefile.am
@@ -2,14 +2,12 @@ EXTRA_DIST = directory.df directory.def makefile.os2 makedll.cmd
 
 camlib_LTLIBRARIES = libgphoto2_directory.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	$(EXIF_CFLAGS)
-
+libgphoto2_directory_la_CPPFLAGS = 			\
+	$(CPPFLAGS) $(AM_CPPFLAGS)			\
+	$(LIBEXIF_CFLAGS)
+	
 libgphoto2_directory_la_SOURCES = directory.c
 libgphoto2_directory_la_LDFLAGS = -module -avoid-version
 libgphoto2_directory_la_LIBADD =			\
-	$(EXIF_LIBS)					\
+	$(LIBEXIF_LIBS)					\
 	$(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/enigma13/Makefile.am b/camlibs/enigma13/Makefile.am
index 907db0038..546651cfd 100644
--- a/camlibs/enigma13/Makefile.am
+++ b/camlibs/enigma13/Makefile.am
@@ -1,14 +1,7 @@
-camlib_LTLIBRARIES = 					\
-	libgphoto2_enigma13.la
+camlib_LTLIBRARIES = libgphoto2_enigma13.la
 
 EXTRA_DIST = STATUS protocol.txt
 
-INCLUDES = \
-        -I$(top_srcdir)/intl				\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_enigma13_la_SOURCES	= enigma13.c
 libgphoto2_enigma13_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
 libgphoto2_enigma13_la_LDFLAGS = -module -avoid-version
diff --git a/camlibs/fuji/Makefile.am b/camlibs/fuji/Makefile.am
index bc6ae9437..037ac8ec0 100644
--- a/camlibs/fuji/Makefile.am
+++ b/camlibs/fuji/Makefile.am
@@ -2,11 +2,6 @@ camlib_LTLIBRARIES = libgphoto2_fuji.la
 
 EXTRA_DIST = PROTOCOL
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_fuji_la_SOURCES = library.c fuji.c fuji.h
 libgphoto2_fuji_la_LDFLAGS = -module -avoid-version
 libgphoto2_fuji_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/gsmart300/Makefile.am b/camlibs/gsmart300/Makefile.am
index 797ac65a5..658d04899 100644
--- a/camlibs/gsmart300/Makefile.am
+++ b/camlibs/gsmart300/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_gsmart300.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_gsmart300_la_SOURCES = gsmart300.c gsmart300.h library.c \
                                gsmart300-jpeg-header.h 
 libgphoto2_gsmart300_la_LDFLAGS = -module -avoid-version
diff --git a/camlibs/iclick/Makefile.am b/camlibs/iclick/Makefile.am
index 6e13c0a1d..6c4430399 100644
--- a/camlibs/iclick/Makefile.am
+++ b/camlibs/iclick/Makefile.am
@@ -1,13 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_iclick.la
 
-INCLUDES =                              		\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port			\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)					\
-	-I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_iclick_la_SOURCES = library.c iclick.c iclick.h  
 libgphoto2_iclick_la_LDFLAGS = -module -avoid-version
 libgphoto2_iclick_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/jamcam/Makefile.am b/camlibs/jamcam/Makefile.am
index 534804715..f71b0d489 100644
--- a/camlibs/jamcam/Makefile.am
+++ b/camlibs/jamcam/Makefile.am
@@ -1,10 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_jamcam.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_jamcam_la_SOURCES = jamcam.c library.c library.h
 libgphoto2_jamcam_la_LDFLAGS = -module -avoid-version
 libgphoto2_jamcam_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/jd11/Makefile.am b/camlibs/jd11/Makefile.am
index 98b89eafc..614707245 100644
--- a/camlibs/jd11/Makefile.am
+++ b/camlibs/jd11/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = jd11.html
 
 camlib_LTLIBRARIES = libgphoto2_jd11.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_jd11_la_SOURCES = jd11.c serial.h serial.c decomp.h decomp.c
 libgphoto2_jd11_la_LDFLAGS = -module -avoid-version
 libgphoto2_jd11_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am
index 9cc208e74..163ca2ea3 100644
--- a/camlibs/kodak/dc120/Makefile.am
+++ b/camlibs/kodak/dc120/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = kodak.df makefile.os2
 
 camlib_LTLIBRARIES = libgphoto2_kodak_dc120.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_kodak_dc120_la_SOURCES = dc120.c dc120.h library.c library.h
 libgphoto2_kodak_dc120_la_LDFLAGS = -module -avoid-version
 libgphoto2_kodak_dc120_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/kodak/dc210/Makefile.am b/camlibs/kodak/dc210/Makefile.am
index 260fc64b9..130211907 100644
--- a/camlibs/kodak/dc210/Makefile.am
+++ b/camlibs/kodak/dc210/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = kodak.df makefile.os2
 
 camlib_LTLIBRARIES = libgphoto2_kodak_dc210.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_kodak_dc210_la_SOURCES = dc210.c dc210.h library.c library.h
 libgphoto2_kodak_dc210_la_LDFLAGS = -module -avoid-version
 libgphoto2_kodak_dc210_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am
index b7649100d..ac0a2c6f0 100644
--- a/camlibs/kodak/dc240/Makefile.am
+++ b/camlibs/kodak/dc240/Makefile.am
@@ -2,12 +2,6 @@ EXTRA_DIST = kodak.df makefile.os2
 
 camlib_LTLIBRARIES = libgphoto2_kodak_dc240.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_kodak_dc240_la_SOURCES = dc240.c dc240.h library.c library.h
 libgphoto2_kodak_dc240_la_LDFLAGS = -module -avoid-version
 libgphoto2_kodak_dc240_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/kodak/dc3200/Makefile.am b/camlibs/kodak/dc3200/Makefile.am
index 6ee43326c..61e762d05 100644
--- a/camlibs/kodak/dc3200/Makefile.am
+++ b/camlibs/kodak/dc3200/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = kodak.df makefile.os2
 
 camlib_LTLIBRARIES = libgphoto2_kodak_dc3200.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_kodak_dc3200_la_SOURCES = dc3200.c dc3200.h library.c library.h
 libgphoto2_kodak_dc3200_la_LDFLAGS = -module -avoid-version
 libgphoto2_kodak_dc3200_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/kodak/ez200/Makefile.am b/camlibs/kodak/ez200/Makefile.am
index 36bace75f..f80f48e37 100644
--- a/camlibs/kodak/ez200/Makefile.am
+++ b/camlibs/kodak/ez200/Makefile.am
@@ -2,14 +2,6 @@ camlib_LTLIBRARIES = libgphoto2_ez200.la
 
 EXTRA_DIST = Protocol.txt
 
-INCLUDES =                              		\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port			\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)					\
-	-I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_ez200_la_SOURCES = library.c ez200.c ez200.h
 libgphoto2_ez200_la_LDFLAGS = -module -avoid-version
 libgphoto2_ez200_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am
index ffd39c3a4..a4fb75dec 100644
--- a/camlibs/konica/Makefile.am
+++ b/camlibs/konica/Makefile.am
@@ -4,11 +4,8 @@ camlib_LTLIBRARIES = libgphoto2_konica.la libgphoto2_konica_qm150.la
 
 EXTRA_DIST = EXPERTS konica.df makefile.os2 qm150.txt
 
-INCLUDES =\
- -DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\"	\
- -I$(top_srcdir)/intl					\
- -I$(top_srcdir)/libgphoto2				\
- -I$(top_srcdir)/libgphoto2_port/libgphoto2_port
+DEFS = \
+	-DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\"
 
 libgphoto2_konica_la_SOURCES = \
  lowlevel.c lowlevel.h \
diff --git a/camlibs/largan/lmini/Makefile.am b/camlibs/largan/lmini/Makefile.am
index bafe79e51..61aa06be6 100644
--- a/camlibs/largan/lmini/Makefile.am
+++ b/camlibs/largan/lmini/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_largan.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_largan_la_SOURCES = largan.c lmini.c lmini_ccd.c lmini.h lmini_ccd.h
 libgphoto2_largan_la_LDFLAGS = -module -avoid-version
 libgphoto2_largan_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/mars/Makefile.am b/camlibs/mars/Makefile.am
index 79f53831f..f3c7293e2 100644
--- a/camlibs/mars/Makefile.am
+++ b/camlibs/mars/Makefile.am
@@ -2,14 +2,6 @@ camlib_LTLIBRARIES = libgphoto2_mars.la
 
 EXTRA_DIST = protocol.txt
 
-INCLUDES =                              		\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port			\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)					\
-	-I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_mars_la_SOURCES = library.c mars.c mars.h
 libgphoto2_mars_la_LDFLAGS = -module -avoid-version
 libgphoto2_mars_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am
index 2bb7b9ba1..188bae7fd 100644
--- a/camlibs/minolta/dimagev/Makefile.am
+++ b/camlibs/minolta/dimagev/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = dimagev.df makefile.os2
 
 camlib_LTLIBRARIES = libgphoto2_dimagev.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_dimagev_la_SOURCES = capture.c data.c delete.c dimagev.c dimagev.h \
 	download.c info.c packet.c status.c upload.c util.c
 
diff --git a/camlibs/mustek/Makefile.am b/camlibs/mustek/Makefile.am
index 40368be73..047c7f80b 100644
--- a/camlibs/mustek/Makefile.am
+++ b/camlibs/mustek/Makefile.am
@@ -2,13 +2,6 @@ camlib_LTLIBRARIES = libgphoto2_mustek.la
 
 EXTRA_DIST = AUTHOR
 
-INCLUDES = \
-        -I$(top_srcdir)/intl				\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
-
-
 libgphoto2_mustek_la_SOURCES = mdc800.c core.c image.c io.c rs232.c usb.c core.h image.h io.h mdc800_spec.h print.h rs232.h usb.h
 
 libgphoto2_mustek_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am
index f893035f6..4cd4450e3 100644
--- a/camlibs/panasonic/Makefile.am
+++ b/camlibs/panasonic/Makefile.am
@@ -6,12 +6,6 @@ camlib_LTLIBRARIES =\
  libgphoto2_panasonic_dc1000.la\
  libgphoto2_panasonic_dc1580.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_panasonic_dc1000_la_SOURCES = dc1000.c dc1000.h dc.c dc.h
 libgphoto2_panasonic_dc1000_la_LDFLAGS = -module -avoid-version
 libgphoto2_panasonic_dc1000_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/panasonic/coolshot/Makefile.am b/camlibs/panasonic/coolshot/Makefile.am
index 6fa1f82d5..573c839ff 100644
--- a/camlibs/panasonic/coolshot/Makefile.am
+++ b/camlibs/panasonic/coolshot/Makefile.am
@@ -1,10 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_panasonic_coolshot.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_panasonic_coolshot_la_SOURCES = coolshot.c library.c library.h
 libgphoto2_panasonic_coolshot_la_LDFLAGS = -module -avoid-version
 libgphoto2_panasonic_coolshot_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/panasonic/l859/Makefile.am b/camlibs/panasonic/l859/Makefile.am
index 011c9f49f..2ef47bd0e 100644
--- a/camlibs/panasonic/l859/Makefile.am
+++ b/camlibs/panasonic/l859/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_panasonic_l859.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_panasonic_l859_la_SOURCES = l859.c l859.h
 libgphoto2_panasonic_l859_la_LDFLAGS = -module -avoid-version
 libgphoto2_panasonic_l859_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/pccam300/Makefile.am b/camlibs/pccam300/Makefile.am
index a03adf004..674106c05 100644
--- a/camlibs/pccam300/Makefile.am
+++ b/camlibs/pccam300/Makefile.am
@@ -1,11 +1,6 @@
 camlibdir = $(libdir)/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_pccam300.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_pccam300_la_SOURCES = pccam300.c pccam300.h library.c 
 libgphoto2_pccam300_la_LDFLAGS = -module -avoid-version
 libgphoto2_pccam300_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/pccam600/Makefile.am b/camlibs/pccam600/Makefile.am
index 1c69b9e57..a68e2eaba 100644
--- a/camlibs/pccam600/Makefile.am
+++ b/camlibs/pccam600/Makefile.am
@@ -1,10 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_pccam600.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_pccam600_la_SOURCES = pccam600.c pccam600.h library.c 
 libgphoto2_pccam600_la_LDFLAGS = -module -avoid-version
 libgphoto2_pccam600_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/polaroid/Makefile.am b/camlibs/polaroid/Makefile.am
index 76862bf9c..9f071b624 100644
--- a/camlibs/polaroid/Makefile.am
+++ b/camlibs/polaroid/Makefile.am
@@ -5,12 +5,6 @@ camlib_LTLIBRARIES =			\
 	libgphoto2_polaroid_pdc640.la	\
 	libgphoto2_polaroid_pdc700.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_polaroid_pdc320_la_SOURCES = pdc320.c pdc320.h
 libgphoto2_polaroid_pdc640_la_SOURCES = pdc640.c jd350e.h jd350e.c jd350e_red.h jd350e_blue.h dlink350f.c dlink350f.h
 libgphoto2_polaroid_pdc700_la_SOURCES = pdc700.c
diff --git a/camlibs/ptp2/Makefile.am b/camlibs/ptp2/Makefile.am
index e40ded590..509e6b259 100644
--- a/camlibs/ptp2/Makefile.am
+++ b/camlibs/ptp2/Makefile.am
@@ -2,12 +2,6 @@ EXTRA_DIST = ptp-pack.c
 
 camlib_LTLIBRARIES = libgphoto2_ptp2.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_ptp2_la_SOURCES = ptp.c ptp.h library.c ptp-bugs.h
 libgphoto2_ptp2_la_LDFLAGS = -module -avoid-version
 libgphoto2_ptp2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/ricoh/Makefile.am b/camlibs/ricoh/Makefile.am
index 0f1c31e55..11177579a 100644
--- a/camlibs/ricoh/Makefile.am
+++ b/camlibs/ricoh/Makefile.am
@@ -2,12 +2,6 @@ camlib_LTLIBRARIES = libgphoto2_ricoh.la libgphoto2_ricoh_g3.la
 
 EXTRA_DIST = g3.txt
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_ricoh_la_SOURCES = library.c ricoh.c ricoh.h crctab.h
 libgphoto2_ricoh_la_LDFLAGS = -module -avoid-version
 libgphoto2_ricoh_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/samsung/Makefile.am b/camlibs/samsung/Makefile.am
index 2b2df8f2f..2ab36faea 100644
--- a/camlibs/samsung/Makefile.am
+++ b/camlibs/samsung/Makefile.am
@@ -1,10 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_samsung.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_samsung_la_SOURCES = samsung.c
 libgphoto2_samsung_la_LDFLAGS = -module -avoid-version
 libgphoto2_samsung_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am
index 7af74d739..28611e160 100644
--- a/camlibs/sierra/Makefile.am
+++ b/camlibs/sierra/Makefile.am
@@ -2,12 +2,6 @@ EXTRA_DIST = sierra.df makefile.os2 PROTOCOL
 
 camlib_LTLIBRARIES = libgphoto2_sierra.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_sierra_la_SOURCES =\
  sierra.c sierra.h\
  library.c library.h\
diff --git a/camlibs/sipix/Makefile.am b/camlibs/sipix/Makefile.am
index 3643336d4..d5b18cc6b 100644
--- a/camlibs/sipix/Makefile.am
+++ b/camlibs/sipix/Makefile.am
@@ -5,13 +5,6 @@ camlib_LTLIBRARIES = 					\
 
 EXTRA_DIST = web2.html blink.txt xjpeg.c blink2.txt
 
-INCLUDES = \
-        -I$(top_srcdir)/intl				\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
-
-
 libgphoto2_sipix_blink_la_SOURCES	= blink.c
 libgphoto2_sipix_blink2_la_SOURCES	= blink2.c
 libgphoto2_sipix_web2_la_SOURCES	= web2.c
diff --git a/camlibs/smal/Makefile.am b/camlibs/smal/Makefile.am
index e8283e2bc..23c8b0f44 100644
--- a/camlibs/smal/Makefile.am
+++ b/camlibs/smal/Makefile.am
@@ -1,11 +1,5 @@
-camlibdir = $(libdir)/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_smal.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_smal_la_SOURCES = smal.c ultrapocket.c smal.h ultrapocket.h
 libgphoto2_smal_la_LDFLAGS = -module -avoid-version
 libgphoto2_smal_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am
index 6b4c2a515..7314b09f4 100644
--- a/camlibs/sonydscf1/Makefile.am
+++ b/camlibs/sonydscf1/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = sonydscf1.df makefile.os2 readme todo
 
 camlib_LTLIBRARIES = libgphoto2_sony_dscf1.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 EXTRA_libgphoto2_sony_dscf1_la_SOURCES = dsc_f1.c
 libgphoto2_sony_dscf1_la_SOURCES = \
 	command.c getuint.c chotplay.c sonydscf1.c sonydscf1.h \
diff --git a/camlibs/sonydscf55/Makefile.am b/camlibs/sonydscf55/Makefile.am
index 264323a65..69a6bca6f 100644
--- a/camlibs/sonydscf55/Makefile.am
+++ b/camlibs/sonydscf55/Makefile.am
@@ -1,10 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_sony_dscf55.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_sony_dscf55_la_SOURCES = sony.c sony.h camera.c nls.h
 libgphoto2_sony_dscf55_la_LDFLAGS = -module -avoid-version
 libgphoto2_sony_dscf55_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/soundvision/Makefile.am b/camlibs/soundvision/Makefile.am
index f3d90ab01..ed8aa81dc 100644
--- a/camlibs/soundvision/Makefile.am
+++ b/camlibs/soundvision/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_soundvision.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_soundvision_la_SOURCES = soundvision.c agfa_cl18.c tiger_fastflicks.c commands.c commands.h soundvision.h
 libgphoto2_soundvision_la_LDFLAGS = -module -avoid-version
 libgphoto2_soundvision_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/spca50x/Makefile.am b/camlibs/spca50x/Makefile.am
index 99c4470eb..e38fb44d6 100644
--- a/camlibs/spca50x/Makefile.am
+++ b/camlibs/spca50x/Makefile.am
@@ -2,12 +2,6 @@ camlib_LTLIBRARIES = libgphoto2_spca50x.la
 
 EXTRA_DIST = ChangeLog.benq ChangeLog.gsmart ChangeLog.spca504_flash lsusb-v
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_spca50x_la_SOURCES = spca50x.c spca50x.h \
 				spca50x-flash.c spca50x-flash.h \
 				spca50x-sdram.c spca50x-sdram.h \
diff --git a/camlibs/sq905/Makefile.am b/camlibs/sq905/Makefile.am
index feeb01469..95e139a88 100644
--- a/camlibs/sq905/Makefile.am
+++ b/camlibs/sq905/Makefile.am
@@ -1,13 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_sq905.la
 
-INCLUDES =                              		\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port			\
-	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)					\
-	-I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_sq905_la_SOURCES = library.c sq905.c sq905.h postprocess.c 
 libgphoto2_sq905_la_LDFLAGS = -module -avoid-version
 libgphoto2_sq905_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/stv0674/Makefile.am b/camlibs/stv0674/Makefile.am
index a8d465af5..9dbab705b 100644
--- a/camlibs/stv0674/Makefile.am
+++ b/camlibs/stv0674/Makefile.am
@@ -2,11 +2,6 @@ EXTRA_DIST = Protocol Changelog
 
 camlib_LTLIBRARIES = libgphoto2_stv0674.la
 
-INCLUDES =						\
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-        -I$(top_srcdir)/libgphoto2
-
 libgphoto2_stv0674_la_SOURCES = stv0674.c stv0674.h library.c library.h
 libgphoto2_stv0674_la_LDFLAGS = -module -avoid-version
 libgphoto2_stv0674_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am
index 8a519f0eb..4fa475bd6 100644
--- a/camlibs/stv0680/Makefile.am
+++ b/camlibs/stv0680/Makefile.am
@@ -2,12 +2,6 @@ EXTRA_DIST = stv0680.df makefile.os2 CREDITS LICENCE README.pdf 680_commands_and
 
 camlib_LTLIBRARIES = libgphoto2_stv0680.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_stv0680_la_SOURCES = stv0680.c stv0680.h library.c library.h \
 			      bayer.c bayer.h sharpen.c sharpen.h \
 			      saturate.c saturate.h \
diff --git a/camlibs/sx330z/Makefile.am b/camlibs/sx330z/Makefile.am
index bed9ee560..5d0901aa7 100644
--- a/camlibs/sx330z/Makefile.am
+++ b/camlibs/sx330z/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_sx330z.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_sx330z_la_SOURCES = library.c sx330z.c sx330z.h
 libgphoto2_sx330z_la_LDFLAGS = -module -avoid-version
 libgphoto2_sx330z_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am
index 4d6b63622..af027d70d 100644
--- a/camlibs/template/Makefile.am
+++ b/camlibs/template/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_template.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_template_la_SOURCES = template.c
 libgphoto2_template_la_LDFLAGS = -module -avoid-version
 libgphoto2_template_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
diff --git a/camlibs/toshiba/pdrm11/Makefile.am b/camlibs/toshiba/pdrm11/Makefile.am
index bc2a096f8..2e959af21 100644
--- a/camlibs/toshiba/pdrm11/Makefile.am
+++ b/camlibs/toshiba/pdrm11/Makefile.am
@@ -1,11 +1,5 @@
 camlib_LTLIBRARIES = libgphoto2_toshiba_pdrm11.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/intl				\
-        -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \
-        -I$(top_srcdir)/libgphoto2			\
-	-I$(top_builddir)/libgphoto2
-
 libgphoto2_toshiba_pdrm11_la_SOURCES = library.c pdrm11.c pdrm11.h
 libgphoto2_toshiba_pdrm11_la_LDFLAGS = -module -avoid-version
 libgphoto2_toshiba_pdrm11_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
author	Hans Ulrich Niedermann <gp@n-dimensional.de>	2005-04-14 18:32:57 +0000
committer	Hans Ulrich Niedermann <gp@n-dimensional.de>	2005-04-14 18:32:57 +0000
commit	39ed60337fc958a8726dabbcba30ae0da33fb923 (patch)
tree	47410340802361aad88a118ee80c931f1ad476d5 /camlibs
parent	898ff8fe4b241da50a8b3dcbca80acf99e445694 (diff)
download	libgphoto2-39ed60337fc958a8726dabbcba30ae0da33fb923.tar.gz