diff options
| author | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2006-12-26 22:30:11 +0000 |
|---|---|---|
| committer | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2006-12-26 22:30:11 +0000 |
| commit | d9e41c4de0f488d6ee932e6db669418775c01008 (patch) | |
| tree | 04daf253e9afb3c91cf27163dc99eac4fad3dff0 /camlibs/sipix | |
| parent | 988b9b987ce53f04f4bbe3ae3583ff0e5981298e (diff) | |
| download | libgphoto2-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/sipix')
| -rw-r--r-- | camlibs/sipix/Makefile-files | 26 | ||||
| -rw-r--r-- | camlibs/sipix/Makefile.am | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/camlibs/sipix/Makefile-files b/camlibs/sipix/Makefile-files new file mode 100644 index 000000000..916b0b1b5 --- /dev/null +++ b/camlibs/sipix/Makefile-files @@ -0,0 +1,26 @@ +EXTRA_DIST += sipix/web2.html sipix/blink.c sipix/blink.txt \ + sipix/xjpeg.c sipix/blink2.txt + +# Seems to be obsolete +EXTRA_LTLIBRARIES += sipix_blink.la + +sipix_blink_la_SOURCES = sipix/blink.c +sipix_blink_la_LDFLAGS = $(camlib_ldflags) +sipix_blink_la_DEPENDENCIES = $(camlib_dependencies) +sipix_blink_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += sipix_blink2.la + +sipix_blink2_la_SOURCES = sipix/blink2.c +sipix_blink2_la_LDFLAGS = $(camlib_ldflags) +sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies) +sipix_blink2_la_LIBADD = $(camlib_libadd) @LIBJPEG@ + + +EXTRA_LTLIBRARIES += sipix_web2.la + +sipix_web2_la_SOURCES = sipix/web2.c +sipix_web2_la_LDFLAGS = $(camlib_ldflags) +sipix_web2_la_DEPENDENCIES = $(camlib_dependencies) +sipix_web2_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sipix/Makefile.am b/camlibs/sipix/Makefile.am deleted file mode 100644 index 9d532c76d..000000000 --- a/camlibs/sipix/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -camlib_LTLIBRARIES = \ - sipix_blink2.la \ - sipix_web2.la - -EXTRA_DIST = web2.html blink.c blink.txt xjpeg.c blink2.txt - - -#sipix_blink_la_SOURCES = blink.c -#sipix_blink_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -# -export-symbols $(top_srcdir)/camlibs/camlib.sym -#sipix_blink_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -#sipix_blink_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la - - -sipix_blink2_la_SOURCES = blink2.c -sipix_blink2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ - -export-symbols $(top_srcdir)/camlibs/camlib.sym -sipix_blink2_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -sipix_blink2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la @LIBJPEG@ - - -sipix_web2_la_SOURCES = web2.c -sipix_web2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ - -export-symbols $(top_srcdir)/camlibs/camlib.sym -sipix_web2_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -sipix_web2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la |