summaryrefslogtreecommitdiff
path: root/camlibs/sonydscf1
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/sonydscf1
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/sonydscf1')
-rw-r--r--camlibs/sonydscf1/Makefile-files15
-rw-r--r--camlibs/sonydscf1/Makefile.am14
2 files changed, 15 insertions, 14 deletions
diff --git a/camlibs/sonydscf1/Makefile-files b/camlibs/sonydscf1/Makefile-files
new file mode 100644
index 000000000..0d7d08cd6
--- /dev/null
+++ b/camlibs/sonydscf1/Makefile-files
@@ -0,0 +1,15 @@
+EXTRA_DIST += sonydscf1/README.sonydscf1 sonydscf1/todo
+camlibdoc_DATA += sonydscf1/README.sonydscf1
+
+EXTRA_LTLIBRARIES += sony_dscf1.la
+
+EXTRA_sony_dscf1_la_SOURCES = sonydscf1/dsc_f1.c
+sony_dscf1_la_SOURCES = \
+ sonydscf1/command.c sonydscf1/getuint.c sonydscf1/chotplay.c \
+ sonydscf1/command.h sonydscf1/getuint.h sonydscf1/chotplay.h \
+ sonydscf1/sonydscf1.c sonydscf1/sonydscf1.h \
+ sonydscf1/pmp.h sonydscf1/common.h
+sony_dscf1_la_LDFLAGS = $(camlib_ldflags)
+sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies)
+sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
+
diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am
deleted file mode 100644
index 41a521eec..000000000
--- a/camlibs/sonydscf1/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-EXTRA_DIST = README.sonydscf1 todo
-
-camlib_LTLIBRARIES = sony_dscf1.la
-
-EXTRA_sony_dscf1_la_SOURCES = dsc_f1.c
-sony_dscf1_la_SOURCES = \
- command.c getuint.c chotplay.c sonydscf1.c sonydscf1.h \
- command.h getuint.h chotplay.h pmp.h common.h
-sony_dscf1_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \
- -export-symbols $(top_srcdir)/camlibs/camlib.sym
-sony_dscf1_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym
-sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la
-
-camlibdoc_DATA = README.sonydscf1