--- a/components/lcms/Makefile Wed Apr 13 10:10:46 2011 -0600
+++ b/components/lcms/Makefile Wed Apr 13 09:58:06 2011 -0700
@@ -35,15 +35,13 @@
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+include ../../make-rules/lint-libraries.mk
PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig
PATCH_LEVEL = 0
-LIBNAME = $(COMPONENT_NAME)
-LINTOUT = lint.out
-
# These aren't set by default.
PYTHON.$(PYTHON_VERSION).32 = /usr/bin/python2.6
PYTHON.$(PYTHON_VERSION).64 = /usr/bin/$(MACH64)/python2.6
@@ -54,6 +52,10 @@
PROTOPYTHONMODULE64DIR = $(PROTOUSRLIBDIR)/python$(PYTHON_VERSION)/vendor-packages/64
PROTOUSRINCLUDEDIR = $(PROTO_DIR)/usr/include
+# We have to do this because libtool builds the C++ library with an
+# incorrect RUNPATH/RPATH
+CCC += -norunpath
+
CFLAGS += -Xc -xnorunpath $(CC_BITS)
CFLAGS += $(studio_C99_ENABLE) $(CPP_POSIX) $(CPP_LARGEFILES)
CPPFLAGS += $(CPP_POSIX) $(CPP_LARGEFILES) -DNDEBUG
@@ -66,9 +68,6 @@
LDFLAGS += -lpython$(PYTHON_VERSION) -lc -lm
PYTHONPATH_32 = /usr/lib/python$(PYTHON_VERSION)
PYTHONPATH_64 = /usr/lib/$(MACH64)/python$(PYTHON_VERSION)
-ELFEDIT = /usr/bin/elfedit
-GSED = /usr/gnu/bin/sed
-DOS2UNIX = /usr/bin/dos2unix
CONFIGURE_ENV += CXX="$(CCC)"
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
@@ -100,59 +99,13 @@
$(RM) -f $(SOURCE_DIR)/include/icc34.h ; \
$(CP) -p include/icc34.h $(SOURCE_DIR)/include/ )
-COMPONENT_POST_BUILD_ACTION = \
- ( cd $(@D) ; \
- $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
- -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
- -I$(COMPONENT_DIR)/$(COMPONENT_SRC) \
- $(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1)
-
-# We have to do this because libtool builds the C++ library with an
-# incorrect RUNPATH/RPATH
-COMPONENT_POST_INSTALL_ACTION = \
- ( $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR)" \
- $(PROTOPYTHONMODULE32DIR)/_lcms.so ; \
- $(ELFEDIT) -e "dyn:rpath $(USRLIBDIR)" \
- $(PROTOPYTHONMODULE32DIR)/_lcms.so ; \
- $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR64)" \
- $(PROTOPYTHONMODULE64DIR)/_lcms.so ; \
- $(ELFEDIT) -e "dyn:rpath $(USRLIBDIR64)" \
- $(PROTOPYTHONMODULE64DIR)/_lcms.so ; \
- $(DOS2UNIX) $(PROTOUSRINCLUDEDIR)/lcms/icc34.h > \
- $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u ; \
- $(CP) -fp $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u \
- $(PROTOUSRINCLUDEDIR)/lcms/icc34.h ; \
- $(DOS2UNIX) $(PROTOUSRINCLUDEDIR)/lcms/lcms.h > \
- $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u ; \
- $(CP) -fp $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u \
- $(PROTOUSRINCLUDEDIR)/lcms/lcms.h ; \
- $(RM) -f $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u \
- $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u ; \
- $(CP) $(COMPONENT_DIR)/llib-l$(LIBNAME) $(PROTOUSRLIBDIR)/ ; \
- cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \
- $(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)) )
+LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
build: $(BUILD_32_and_64)
-MAN1LIST = icc2ps.1 icclink.1 icctrans.1 \
- jpegicc.1 tifficc.1 wtpt.1
-
-include ../../make-rules/shared-targets.mk
+install: $(INSTALL_32_and_64)
-install: $(INSTALL_32_and_64)
- $(MKDIR) $(PROTOUSRSHAREMAN1DIR) ; \
- list1='$(MAN1LIST)'; for f in $$list1; do \
- $(GSED) -f oracleman-stability \
- $(PROTOUSRSHAREMAN1DIR)/$$f > \
- $(PROTOUSRSHAREMAN1DIR)/$$f.sed 2>&1 ; \
- $(CP) -fp $(PROTOUSRSHAREMAN1DIR)/$$f.sed \
- $(PROTOUSRSHAREMAN1DIR)/$$f ; \
- $(RM) -f $(PROTOUSRSHAREMAN1DIR)/$$f.sed ; \
- done
-
-test: $(BUILD_32_and_64)
- @cd $(BUILD_DIR_32); $(GMAKE) check
- @cd $(BUILD_DIR_64); $(GMAKE) check
+test: $(TEST_32_and_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)