Make SampleICC switchable between system and internal one.

configure.in

@@ -951,6 +951,11 @@ AC_ARG_WITH(system-nss,
         [Use NSS/nspr libraries already on system.]),,
     [with_system_nss="$with_system_libs"])
 
+AC_ARG_WITH(system-sampleicc,
+    AS_HELP_STRING([--with-system-sampleicc],
+        [Use SampleICC libraries already on system (used only during build).]),,
+    [with_system_sampleicc="$with_system_libs"])
+
 AC_ARG_WITH(mozilla-version,
     AS_HELP_STRING([--with-mozilla-version],
         [Choose which version of Mozilla to use while building Mozilla.
@@ -6204,6 +6209,22 @@ AC_SUBST(SYSTEM_GRAPHITE)
 AC_SUBST(GRAPHITE_LIBS)
 AC_SUBST(GRAPHITE_CFLAGS)
 
+dnl ===================================================================
+dnl SampleICC
+dnl ===================================================================
+AC_MSG_CHECKING([whether to use system SampleICC])
+if test "$with_system_sampleicc" = "yes"; then
+    AC_MSG_RESULT([yes])
+    SYSTEM_SAMPLEICC=YES
+    PKG_CHECK_MODULES(SAMPLEICC, sampleicc)
+else
+    AC_MSG_RESULT([no])
+    SYSTEM_SAMPLEICC=NO
+fi
+AC_SUBST(SYSTEM_SAMPLEICC)
+AC_SUBST(SAMPLEICC_LIBS)
+AC_SUBST(SAMPLEICC_CFLAGS)
+
 dnl ===================================================================
 dnl Checks for libraries.
 dnl ===================================================================

icc/SampleICC-makefiles.patch

@@ -46,7 +46,7 @@
 +ALLTAR: Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST)
 +
 +Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST) .PHONY:
-+    cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake && cd ..$/CmdLine$/create_sRGB_profile && dmake
++    cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake
 +
 --- /dev/null	2011-10-28 11:24:51.341910850 +0100
 +++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk	2011-11-04 08:50:20.000000000 +0000

icc/makefile.mk

@@ -30,6 +30,11 @@ PRJ=.
 PRJNAME=icc
 TARGET=icc
 
+.IF "$(SYSTEM_SAMPLEICC)" == "YES"
+all:
+    @echo "Using system SampleICC, nothing to do here."
+.ELSE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
@@ -49,14 +54,10 @@ CONVERTFILES= \
     Contrib$/ICC_utils$/Stubs.h \
     Contrib$/ICC_utils$/Vetters.cpp
 
-.IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine
-BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
-.ELSE
-CONFIGURE_ACTION= 
-BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf -
-.ENDIF
+CONFIGURE_ACTION=
+BUILD_ACTION=dmake
 
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 

icc/prj/build.lst

 ip     icc :	solenv external sal NULL
-ip	icc		usr1	-	all	ip_mkout NULL
-ip	icc		nmake	-	all	ip_icc	NULL
+ip	icc				usr1	-	all	ip_mkout 		NULL
+ip	icc				nmake	-	all	ip_icc			NULL
+ip      icc/source/create_sRGB_profile	nmake	-	all	ip_profile ip_icc	NULL 

icc/prj/d.lst

 mkdir: %_DEST%\inc\icc
-mkdir: %_DEST%\inc\external\icc
-
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
 
+..\%__SRC%\bin\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx

icc/source/create_sRGB_profile/Makefile.am

-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = \
-	create_display_profile
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/IccProfLib \
-	-I$(top_srcdir)/Contrib/ICC_utils
-
-LDADD = -L$(top_builddir)/IccProfLib -lSampleICC \
-	-L$(top_builddir)/Contrib/ICC_utils -lICC_utils
-
-create_display_profile_SOURCES = \
-	create_display_profile.cpp

icc/source/create_sRGB_profile/Makefile.in

-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-EGREP = @EGREP@
-F77 = @F77@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_VERSION = @LIBTOOL_VERSION@
-LN_S = @LN_S@
-MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-RC = @RC@
-SAMPLEICC_VERSION = @SAMPLEICC_VERSION@
-SICC_ICC_APPLY_PROFILES = @SICC_ICC_APPLY_PROFILES@
-STRIP = @STRIP@
-TIFF_CPPFLAGS = @TIFF_CPPFLAGS@
-TIFF_LDFLAGS = @TIFF_LDFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-bin_PROGRAMS = \
-	create_sRGB_profile
-
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/IccProfLib \
-	-I$(top_srcdir)/Contrib/ICC_utils
-
-
-LDADD = -L$(top_builddir)/IccProfLib -lSampleICC \
-	-L$(top_builddir)/Contrib/ICC_utils -lICC_utils
-
-
-create_sRGB_profile_SOURCES = \
-	create_sRGB_profile.cpp
-
-subdir = Contrib/CmdLine/create_sRGB_profile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = create_sRGB_profile$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_create_sRGB_profile_OBJECTS = create_sRGB_profile.$(OBJEXT)
-create_sRGB_profile_OBJECTS = $(am_create_sRGB_profile_OBJECTS)
-create_sRGB_profile_LDADD = $(LDADD)
-create_sRGB_profile_DEPENDENCIES =
-create_sRGB_profile_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/create_sRGB_profile.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(create_sRGB_profile_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(create_sRGB_profile_SOURCES)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Contrib/CmdLine/create_sRGB_profile/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-create_sRGB_profile$(EXEEXT): $(create_sRGB_profile_OBJECTS) $(create_sRGB_profile_DEPENDENCIES) 
-	@rm -f create_sRGB_profile$(EXEEXT)
-	$(CXXLINK) $(create_sRGB_profile_LDFLAGS) $(create_sRGB_profile_OBJECTS) $(create_sRGB_profile_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create_sRGB_profile.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cpp.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
-
-# 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.
-.NOEXPORT:

icc/source/create_sRGB_profile/makefile.mk

@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..$/..$/..$/..$/..
+PRJ=..$/..$/
 
 PRJNAME=icc
 TARGET=create_sRGB_profile
@@ -37,19 +37,18 @@ LIBTARGET=NO
 TARGETTYPE=CUI
 
 ENABLE_EXCEPTIONS=TRUE
-
 EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
 
-CFLAGS+=-I..$/..$/..$/IccProfLib -I..$/..$/ICC_utils
-
-# This tool uses unaligned memory accesses which will lead
-# to SIGBUS on platforms who care, like Solaris LP64
-.IF "$(OS)$(CPU)"=="SOLARISU"
-LINKFLAGS+=-xmemalign=8i
+.IF "$(SYSTEM_SAMPLEICC)"=="YES"
+CFLAGS+=$(SAMPLEICC_CFLAGS)
+.ELSE
+CFLAGS+= \
+    -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \
+    -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -58,21 +57,29 @@ OBJFILES= $(OBJ)$/create_sRGB_profile.obj
 
 # --- Targets ------------------------------------------------------
 
-# svdem
 APP1LIBSALCPPRT:=
 UWINAPILIB:=
-APP1NOSAL=		TRUE
+APP1NOSAL=	TRUE
 APP1TARGET= 	$(TARGET)
+.IF "$(SYSTEM_SAMPLEICC)"=="YES"
+APP1LIBS=
+APP1STDLIBS=\
+    $(SAMPLEICC_LIBS) \
+    -lICC_utils
+# this library is not in pkgconfig but in the same dir
+# so no need to cry for it and just hardcode it here
+.ELSE
 APP1LIBS=\
     $(SLB)$/proflib.lib \
     $(SLB)$/icutil.lib
-APP1OBJS= $(OBJFILES)
 APP1STDLIBS=
+.ENDIF
+APP1OBJS= $(OBJFILES)
 
 .INCLUDE :	target.mk
 
 ALLTAR: $(TARGET)$(EXECPOST)
 
-$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) makefile.mk
-    rm -f $@
-    $(GNUCOPY) $(BIN)$/$(TARGET)$(EXECPOST) $@
+$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST)
+    rm -rf $@
+    cd $(BIN)$/ && $(BIN)$/$(TARGET)$(EXECPOST)

set_soenv.in

@@ -1543,6 +1543,9 @@ ToFile( "COMMONS_LANG_JAR",  "@COMMONS_LANG_JAR@", "e" );
 ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
 ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
 ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
+ToFile( "SYSTEM_SAMPLEICC", "@SYSTEM_SAMPLEICC@", "e" );
+ToFile( "SAMPLEICC_CFLAGS", "@SAMPLEICC_CFLAGS@", "e" );
+ToFile( "SAMPLEICC_LIBS", "@SAMPLEICC_LIBS@", "e" );
 ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
 ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
 ToFile( "DBUS_CFLAGS",       "@DBUS_CFLAGS@",      "e" );