Fix some warnings, fixes #3

[android-x86/external-s2tc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 43e8361..5612fb1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,39 @@
 ACLOCAL_AMFLAGS = -I m4
-bin_PROGRAMS = s2tc s2tc_decompress
-s2tc_SOURCES = s2tc.cpp
-blind_id_LDADD = libtxc_dxtn.la
-s2tc_decompress_SOURCES = s2tc_decompress.cpp
-s2tc_decompress_LDADD = libtxc_dxtn.la
 
-libtxc_dxtn_SOURCES = s2tc_compressor.cpp s2tc_libtxc_dxtn.cpp
+if ENABLE_RUNTIME_LINKING
+AM_CPPFLAGS = -DENABLE_RUNTIME_LINKING
+endif
+
+if ENABLE_TOOLS
+bin_PROGRAMS = s2tc_compress s2tc_decompress s2tc_from_s3tc
+s2tc_from_s3tc_SOURCES = s2tc_from_s3tc.cpp s2tc_license.h
+s2tc_compress_SOURCES = s2tc_compress.cpp txc_dxtn.h s2tc_license.h
+s2tc_decompress_SOURCES = s2tc_decompress.cpp txc_dxtn.h s2tc_license.h
+if ENABLE_RUNTIME_LINKING
+s2tc_compress_LDADD = -ldl
+s2tc_decompress_LDADD = -ldl
+else
+if ENABLE_LIB
+s2tc_compress_LDADD = libtxc_dxtn.la
+s2tc_decompress_LDADD = libtxc_dxtn.la
+else
+s2tc_compress_LDADD = -ltxc_dxtn
+s2tc_decompress_LDADD = -ltxc_dxtn
+endif
+endif
+endif
 
-libd0_blind_id_la_LDFLAGS = -versioninfo 0:0:0
-libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+if ENABLE_LIB
+lib_LTLIBRARIES = libtxc_dxtn.la
+libtxc_dxtn_la_SOURCES = s2tc_algorithm.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_algorithm.h txc_dxtn.h s2tc_license.h
+libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0
+libtxc_dxtn_la_LIBADD = -lm
+libtxc_dxtn_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
 library_includedir = $(includedir)
-library_include_HEADERS = libtxc_dxtn.h
+library_include_HEADERS = txc_dxtn.h
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_HEADERS = libtxc_dxtn.pc
+pkgconfig_HEADERS = txc_dxtn.pc
+endif
 
 # versioninfo:
 #   - compatible interface change: c:r:a -> c+1:0:a+1