summaryrefslogtreecommitdiff
path: root/camlibs/ricoh
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <gp@n-dimensional.de>2006-12-26 22:30:11 +0000
committerHans Ulrich Niedermann <gp@n-dimensional.de>2006-12-26 22:30:11 +0000
commitd9e41c4de0f488d6ee932e6db669418775c01008 (patch)
tree04daf253e9afb3c91cf27163dc99eac4fad3dff0 /camlibs/ricoh
parent988b9b987ce53f04f4bbe3ae3583ff0e5981298e (diff)
downloadlibgphoto2-d9e41c4de0f488d6ee932e6db669418775c01008.tar.gz
2.3.1.0.trunk, non-recursive camlibs build
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9736 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/ricoh')
-rw-r--r--camlibs/ricoh/Makefile-files17
-rw-r--r--camlibs/ricoh/Makefile.am15
2 files changed, 17 insertions, 15 deletions
diff --git a/camlibs/ricoh/Makefile-files b/camlibs/ricoh/Makefile-files
new file mode 100644
index 000000000..2d51551b5
--- /dev/null
+++ b/camlibs/ricoh/Makefile-files
@@ -0,0 +1,17 @@
+EXTRA_DIST += ricoh/g3.txt
+
+
+EXTRA_LTLIBRARIES += ricoh.la
+
+ricoh_la_SOURCES = ricoh/library.c ricoh/ricoh.c ricoh/ricoh.h ricoh/crctab.h
+ricoh_la_LDFLAGS = $(camlib_ldflags)
+ricoh_la_DEPENDENCIES = $(camlib_dependencies)
+ricoh_la_LIBADD = $(camlib_libadd)
+
+
+EXTRA_LTLIBRARIES += ricoh_g3.la
+
+ricoh_g3_la_SOURCES = ricoh/g3.c
+ricoh_g3_la_LDFLAGS = $(camlib_ldflags)
+ricoh_g3_la_DEPENDENCIES = $(camlib_dependencies)
+ricoh_g3_la_LIBADD = $(camlib_libadd)
diff --git a/camlibs/ricoh/Makefile.am b/camlibs/ricoh/Makefile.am
deleted file mode 100644
index 13321697d..000000000
--- a/camlibs/ricoh/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-camlib_LTLIBRARIES = ricoh.la ricoh_g3.la
-
-EXTRA_DIST = g3.txt
-
-ricoh_la_SOURCES = library.c ricoh.c ricoh.h crctab.h
-ricoh_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \
- -export-symbols $(top_srcdir)/camlibs/camlib.sym
-ricoh_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym
-ricoh_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
-
-ricoh_g3_la_SOURCES = g3.c
-ricoh_g3_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \
- -export-symbols $(top_srcdir)/camlibs/camlib.sym
-ricoh_g3_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym
-ricoh_g3_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la