summaryrefslogtreecommitdiff
path: root/codec
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2011-03-04 10:53:27 +0000
committerAntonin Descampe <antonin@gmail.com>2011-03-04 10:53:27 +0000
commiteb9a2d93a951cfcf367d9e0ec8481b9e71b0d3d9 (patch)
tree99f20e9c4f6e7ac0e65a4e3df294255ab5ca9717 /codec
parentf36842c853f3c0758fd913ba82bb04a741f1fce5 (diff)
updated autotools files to improve build and install procedures (credit to Vincent Torri)
Diffstat (limited to 'codec')
-rw-r--r--codec/Makefile.am34
1 files changed, 15 insertions, 19 deletions
diff --git a/codec/Makefile.am b/codec/Makefile.am
index 3f82c1b4..52811acf 100644
--- a/codec/Makefile.am
+++ b/codec/Makefile.am
@@ -1,27 +1,23 @@
-#jp3d/codec/
-USERLIBS =
-INCLUDES = -I. -I../libjp3dvm
-CFLAGS = -Wall $(INCLUDES)
-
-if with_sharedlibs
-CFLAGS += -DOPJ_EXPORTS
-else
-CFLAGS += -DOPJ_STATIC
-endif
+MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = jp3d_to_volume volume_to_jp3d
LDADD = $(USERLIBS) ../libjp3dvm/libopenjp3dvm.la
-jp3d_to_volume_SOURCES = getopt.c convert.c jp3d_to_volume.c
+jp3d_to_volume_CPPFLAGS =
+jp3d_to_volume_CFLAGS =
+jp3d_to_volume_LDADD = $(top_builddir)/jp3d/libjp3dvm/libopenjp3dvm.la -lm
+jp3d_to_volume_SOURCES = getopt.c convert.c jp3d_to_volume.c convert.h
-volume_to_jp3d_SOURCES = getopt.c convert.c volume_to_jp3d.c
+volume_to_jp3d_CPPFLAGS =
+volume_to_jp3d_CFLAGS =
+volume_to_jp3d_LDADD = $(top_builddir)/jp3d/libjp3dvm/libopenjp3dvm.la
+volume_to_jp3d_SOURCES = getopt.c convert.c volume_to_jp3d.c convert.h
-REPBIN=$(bin_PROGRAMS)
+EXTRA_DIST = \
+CMakeLists.txt \
+windirent.h
-all-local:
- $(INSTALL) -d ../../bin
- $(INSTALL) $(bin_PROGRAMS) ../../bin
- @(for file in ${REPBIN} ; do \
- echo "Installing: ${prefix}/bin/$${file}" >> ../.report.txt ; \
- done)
+install-data-hook:
+ @echo -e " (B)\t\t$(bindir)/jp3d_to_volume$(EXEEXT)" >> $(top_builddir)/report.txt
+ @echo -e " (B)\t\t$(bindir)/volume_to_jp3d$(EXEEXT)" >> $(top_builddir)/report.txt