diff options
author | Marti Maria <marti.maria@littlecms.com> | 2022-06-05 14:18:36 +0200 |
---|---|---|
committer | Marti Maria <marti.maria@littlecms.com> | 2022-06-05 14:18:36 +0200 |
commit | e8689501b5e36faa044ebb258cb193aa97303296 (patch) | |
tree | 43e4c841e792d3ce38bf84a8fc41a2cd26b736a1 | |
parent | 4417cb3b4f3de20bfbfcc8e53e82ef62daf6830a (diff) | |
download | lcms2-e8689501b5e36faa044ebb258cb193aa97303296.tar.gz |
fix autotools files for threaded plugin
tune up linux support
-rwxr-xr-x | configure | 12 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | plugins/Makefile.in | 2 | ||||
-rw-r--r-- | plugins/threaded/Makefile.in | 6 | ||||
-rw-r--r-- | plugins/threaded/include/Makefile.in | 10 | ||||
-rw-r--r-- | plugins/threaded/src/Makefile.in | 115 | ||||
-rw-r--r-- | plugins/threaded/testbed/Makefile.in | 51 |
7 files changed, 85 insertions, 115 deletions
@@ -18559,6 +18559,14 @@ ac_config_files="$ac_config_files plugins/fast_float/include/Makefile" ac_config_files="$ac_config_files plugins/fast_float/testbed/Makefile" +ac_config_files="$ac_config_files plugins/threaded/Makefile" + +ac_config_files="$ac_config_files plugins/threaded/src/Makefile" + +ac_config_files="$ac_config_files plugins/threaded/include/Makefile" + +ac_config_files="$ac_config_files plugins/threaded/testbed/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -19725,6 +19733,10 @@ do "plugins/fast_float/src/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/src/Makefile" ;; "plugins/fast_float/include/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/include/Makefile" ;; "plugins/fast_float/testbed/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/testbed/Makefile" ;; + "plugins/threaded/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/threaded/Makefile" ;; + "plugins/threaded/src/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/threaded/src/Makefile" ;; + "plugins/threaded/include/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/threaded/include/Makefile" ;; + "plugins/threaded/testbed/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/threaded/testbed/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index b374509..505d63a 100644 --- a/configure.ac +++ b/configure.ac @@ -416,4 +416,8 @@ AC_CONFIG_FILES([plugins/fast_float/Makefile]) AC_CONFIG_FILES([plugins/fast_float/src/Makefile]) AC_CONFIG_FILES([plugins/fast_float/include/Makefile]) AC_CONFIG_FILES([plugins/fast_float/testbed/Makefile]) +AC_CONFIG_FILES([plugins/threaded/Makefile]) +AC_CONFIG_FILES([plugins/threaded/src/Makefile]) +AC_CONFIG_FILES([plugins/threaded/include/Makefile]) +AC_CONFIG_FILES([plugins/threaded/testbed/Makefile]) AC_OUTPUT diff --git a/plugins/Makefile.in b/plugins/Makefile.in index b431b76..015446a 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -328,7 +328,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = fast_float +SUBDIRS = fast_float threaded all: all-recursive .SUFFIXES: diff --git a/plugins/threaded/Makefile.in b/plugins/threaded/Makefile.in index 4c8da11..ceef354 100644 --- a/plugins/threaded/Makefile.in +++ b/plugins/threaded/Makefile.in @@ -87,7 +87,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = plugins/fast_float +subdir = plugins/threaded ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -341,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/fast_float/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/threaded/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/fast_float/Makefile + $(AUTOMAKE) --foreign plugins/threaded/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/plugins/threaded/include/Makefile.in b/plugins/threaded/include/Makefile.in index 9629ed7..5e08ee7 100644 --- a/plugins/threaded/include/Makefile.in +++ b/plugins/threaded/include/Makefile.in @@ -91,7 +91,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = plugins/fast_float/include +subdir = plugins/threaded/include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -320,8 +320,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -include_HEADERS = lcms2_fast_float.h -EXTRA_DIST = lcms2_fast_float.h +include_HEADERS = lcms2_threaded.h +EXTRA_DIST = lcms2_threaded.h all: all-am .SUFFIXES: @@ -334,9 +334,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/fast_float/include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/threaded/include/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/fast_float/include/Makefile + $(AUTOMAKE) --foreign plugins/threaded/include/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/plugins/threaded/src/Makefile.in b/plugins/threaded/src/Makefile.in index f420a00..35a411c 100644 --- a/plugins/threaded/src/Makefile.in +++ b/plugins/threaded/src/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# Makefile for building lcms2_fast_float library +# Makefile for building lcms2_threaded plugin # VPATH = @srcdir@ @@ -92,7 +92,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = plugins/fast_float/src +subdir = plugins/threaded/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -139,22 +139,18 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -liblcms2_fast_float_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +liblcms2_threaded_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(top_builddir)/src/liblcms2.la -am_liblcms2_fast_float_la_OBJECTS = fast_8_curves.lo \ - fast_8_matsh_sse.lo fast_8_matsh.lo fast_8_tethra.lo \ - fast_16_tethra.lo fast_float_15bits.lo fast_float_15mats.lo \ - fast_float_cmyk.lo fast_float_curves.lo fast_float_matsh.lo \ - fast_float_separate.lo fast_float_sup.lo fast_float_tethra.lo \ - fast_float_lab.lo -liblcms2_fast_float_la_OBJECTS = $(am_liblcms2_fast_float_la_OBJECTS) +am_liblcms2_threaded_la_OBJECTS = threaded_split.lo threaded_core.lo \ + threaded_main.lo threaded_scheduler.lo +liblcms2_threaded_la_OBJECTS = $(am_liblcms2_threaded_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -liblcms2_fast_float_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +liblcms2_threaded_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(liblcms2_fast_float_la_LDFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) $(liblcms2_threaded_la_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -171,18 +167,10 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/fast_16_tethra.Plo \ - ./$(DEPDIR)/fast_8_curves.Plo ./$(DEPDIR)/fast_8_matsh.Plo \ - ./$(DEPDIR)/fast_8_matsh_sse.Plo ./$(DEPDIR)/fast_8_tethra.Plo \ - ./$(DEPDIR)/fast_float_15bits.Plo \ - ./$(DEPDIR)/fast_float_15mats.Plo \ - ./$(DEPDIR)/fast_float_cmyk.Plo \ - ./$(DEPDIR)/fast_float_curves.Plo \ - ./$(DEPDIR)/fast_float_lab.Plo \ - ./$(DEPDIR)/fast_float_matsh.Plo \ - ./$(DEPDIR)/fast_float_separate.Plo \ - ./$(DEPDIR)/fast_float_sup.Plo \ - ./$(DEPDIR)/fast_float_tethra.Plo +am__depfiles_remade = ./$(DEPDIR)/threaded_core.Plo \ + ./$(DEPDIR)/threaded_main.Plo \ + ./$(DEPDIR)/threaded_scheduler.Plo \ + ./$(DEPDIR)/threaded_split.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -202,8 +190,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(liblcms2_fast_float_la_SOURCES) -DIST_SOURCES = $(liblcms2_fast_float_la_SOURCES) +SOURCES = $(liblcms2_threaded_la_SOURCES) +DIST_SOURCES = $(liblcms2_threaded_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -273,7 +261,7 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBRARY_AGE = 0 LIBRARY_CURRENT = 1 -LIBRARY_REVISION = 1 +LIBRARY_REVISION = 0 LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ @@ -377,16 +365,13 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.7 foreign # Shared libraries built in this directory -lib_LTLIBRARIES = liblcms2_fast_float.la +lib_LTLIBRARIES = liblcms2_threaded.la AM_CPPFLAGS = -Ofast -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/../include -I$(builddir)/../include -liblcms2_fast_float_la_LDFLAGS = -no-undefined \ +liblcms2_threaded_la_LDFLAGS = -no-undefined \ -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE) -liblcms2_fast_float_la_LIBADD = $(LCMS_LIB_DEPLIBS) $(top_builddir)/src/liblcms2.la -liblcms2_fast_float_la_SOURCES = fast_8_curves.c fast_8_matsh_sse.c fast_8_matsh.c fast_8_tethra.c \ - fast_16_tethra.c fast_float_15bits.c fast_float_15mats.c fast_float_cmyk.c fast_float_curves.c fast_float_matsh.c \ - fast_float_separate.c fast_float_sup.c fast_float_tethra.c fast_float_lab.c fast_float_internal.h - +liblcms2_threaded_la_LIBADD = $(LCMS_LIB_DEPLIBS) $(top_builddir)/src/liblcms2.la +liblcms2_threaded_la_SOURCES = threaded_split.c threaded_core.c threaded_main.c threaded_scheduler.c threaded_internal.h all: all-am .SUFFIXES: @@ -400,9 +385,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/fast_float/src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/threaded/src/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/fast_float/src/Makefile + $(AUTOMAKE) --foreign plugins/threaded/src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,8 +441,8 @@ clean-libLTLIBRARIES: rm -f $${locs}; \ } -liblcms2_fast_float.la: $(liblcms2_fast_float_la_OBJECTS) $(liblcms2_fast_float_la_DEPENDENCIES) $(EXTRA_liblcms2_fast_float_la_DEPENDENCIES) - $(AM_V_CCLD)$(liblcms2_fast_float_la_LINK) -rpath $(libdir) $(liblcms2_fast_float_la_OBJECTS) $(liblcms2_fast_float_la_LIBADD) $(LIBS) +liblcms2_threaded.la: $(liblcms2_threaded_la_OBJECTS) $(liblcms2_threaded_la_DEPENDENCIES) $(EXTRA_liblcms2_threaded_la_DEPENDENCIES) + $(AM_V_CCLD)$(liblcms2_threaded_la_LINK) -rpath $(libdir) $(liblcms2_threaded_la_OBJECTS) $(liblcms2_threaded_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -465,20 +450,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_16_tethra.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_8_curves.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_8_matsh.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_8_matsh_sse.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_8_tethra.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_15bits.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_15mats.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_cmyk.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_curves.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_lab.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_matsh.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_separate.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_sup.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_tethra.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_core.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_main.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_scheduler.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_split.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -644,20 +619,10 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/fast_16_tethra.Plo - -rm -f ./$(DEPDIR)/fast_8_curves.Plo - -rm -f ./$(DEPDIR)/fast_8_matsh.Plo - -rm -f ./$(DEPDIR)/fast_8_matsh_sse.Plo - -rm -f ./$(DEPDIR)/fast_8_tethra.Plo - -rm -f ./$(DEPDIR)/fast_float_15bits.Plo - -rm -f ./$(DEPDIR)/fast_float_15mats.Plo - -rm -f ./$(DEPDIR)/fast_float_cmyk.Plo - -rm -f ./$(DEPDIR)/fast_float_curves.Plo - -rm -f ./$(DEPDIR)/fast_float_lab.Plo - -rm -f ./$(DEPDIR)/fast_float_matsh.Plo - -rm -f ./$(DEPDIR)/fast_float_separate.Plo - -rm -f ./$(DEPDIR)/fast_float_sup.Plo - -rm -f ./$(DEPDIR)/fast_float_tethra.Plo + -rm -f ./$(DEPDIR)/threaded_core.Plo + -rm -f ./$(DEPDIR)/threaded_main.Plo + -rm -f ./$(DEPDIR)/threaded_scheduler.Plo + -rm -f ./$(DEPDIR)/threaded_split.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -703,20 +668,10 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/fast_16_tethra.Plo - -rm -f ./$(DEPDIR)/fast_8_curves.Plo - -rm -f ./$(DEPDIR)/fast_8_matsh.Plo - -rm -f ./$(DEPDIR)/fast_8_matsh_sse.Plo - -rm -f ./$(DEPDIR)/fast_8_tethra.Plo - -rm -f ./$(DEPDIR)/fast_float_15bits.Plo - -rm -f ./$(DEPDIR)/fast_float_15mats.Plo - -rm -f ./$(DEPDIR)/fast_float_cmyk.Plo - -rm -f ./$(DEPDIR)/fast_float_curves.Plo - -rm -f ./$(DEPDIR)/fast_float_lab.Plo - -rm -f ./$(DEPDIR)/fast_float_matsh.Plo - -rm -f ./$(DEPDIR)/fast_float_separate.Plo - -rm -f ./$(DEPDIR)/fast_float_sup.Plo - -rm -f ./$(DEPDIR)/fast_float_tethra.Plo + -rm -f ./$(DEPDIR)/threaded_core.Plo + -rm -f ./$(DEPDIR)/threaded_main.Plo + -rm -f ./$(DEPDIR)/threaded_scheduler.Plo + -rm -f ./$(DEPDIR)/threaded_split.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/plugins/threaded/testbed/Makefile.in b/plugins/threaded/testbed/Makefile.in index eec2fad..2a64a29 100644 --- a/plugins/threaded/testbed/Makefile.in +++ b/plugins/threaded/testbed/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# Makefile for building fast_float_testbed +# Makefile for building threaded_testbed # VPATH = @srcdir@ am__is_gnu_make = { \ @@ -91,8 +91,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = fast_float_testbed$(EXEEXT) -subdir = plugins/fast_float/testbed +check_PROGRAMS = threaded_testbed$(EXEEXT) +subdir = plugins/threaded/testbed ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -109,20 +109,19 @@ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am_fast_float_testbed_OBJECTS = fast_float_testbed.$(OBJEXT) -fast_float_testbed_OBJECTS = $(am_fast_float_testbed_OBJECTS) +am_threaded_testbed_OBJECTS = threaded_testbed.$(OBJEXT) +threaded_testbed_OBJECTS = $(am_threaded_testbed_OBJECTS) am__DEPENDENCIES_1 = -fast_float_testbed_DEPENDENCIES = \ - $(builddir)/../src/liblcms2_fast_float.la \ - $(am__DEPENDENCIES_1) +threaded_testbed_DEPENDENCIES = \ + $(builddir)/../src/liblcms2_threaded.la $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -fast_float_testbed_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +threaded_testbed_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(fast_float_testbed_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(AM_CFLAGS) $(CFLAGS) $(threaded_testbed_LDFLAGS) $(LDFLAGS) \ + -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -138,7 +137,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/fast_float_testbed.Po +am__depfiles_remade = ./$(DEPDIR)/threaded_testbed.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -158,8 +157,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(fast_float_testbed_SOURCES) -DIST_SOURCES = $(fast_float_testbed_SOURCES) +SOURCES = $(threaded_testbed_SOURCES) +DIST_SOURCES = $(threaded_testbed_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -334,9 +333,9 @@ AUTOMAKE_OPTIONS = 1.7 foreign AM_CPPFLAGS = -I$(builddir)/../include -I$(srcdir)/../include -I$(srcdir)/../src \ -I$(top_builddir)/include -fast_float_testbed_LDADD = $(builddir)/../src/liblcms2_fast_float.la $(LCMS_LIB_DEPLIBS) -fast_float_testbed_LDFLAGS = -static @LDFLAGS@ -fast_float_testbed_SOURCES = fast_float_testbed.c +threaded_testbed_LDADD = $(builddir)/../src/liblcms2_threaded.la $(LCMS_LIB_DEPLIBS) +threaded_testbed_LDFLAGS = -static @LDFLAGS@ +threaded_testbed_SOURCES = threaded_testbed.c EXTRA_DIST = test0.icc test1.icc test2.icc test3.icc test5.icc all: all-am @@ -351,9 +350,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/fast_float/testbed/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/threaded/testbed/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/fast_float/testbed/Makefile + $(AUTOMAKE) --foreign plugins/threaded/testbed/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -381,9 +380,9 @@ clean-checkPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -fast_float_testbed$(EXEEXT): $(fast_float_testbed_OBJECTS) $(fast_float_testbed_DEPENDENCIES) $(EXTRA_fast_float_testbed_DEPENDENCIES) - @rm -f fast_float_testbed$(EXEEXT) - $(AM_V_CCLD)$(fast_float_testbed_LINK) $(fast_float_testbed_OBJECTS) $(fast_float_testbed_LDADD) $(LIBS) +threaded_testbed$(EXEEXT): $(threaded_testbed_OBJECTS) $(threaded_testbed_DEPENDENCIES) $(EXTRA_threaded_testbed_DEPENDENCIES) + @rm -f threaded_testbed$(EXEEXT) + $(AM_V_CCLD)$(threaded_testbed_LINK) $(threaded_testbed_OBJECTS) $(threaded_testbed_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -391,7 +390,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_float_testbed.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_testbed.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -555,7 +554,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/fast_float_testbed.Po + -rm -f ./$(DEPDIR)/threaded_testbed.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -601,7 +600,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/fast_float_testbed.Po + -rm -f ./$(DEPDIR)/threaded_testbed.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -643,7 +642,7 @@ check: if [ "x$(srcdir)" != "x$(builddir)" ]; then \ cp $(srcdir)/test?.icc . ; \ fi - ./fast_float_testbed + ./threaded_testbed # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |