components/apache2-modules/modules.mk
changeset 5172 2ac937ed383b
parent 3817 30b42c38bbc4
child 5682 94c0ca64c022
equal deleted inserted replaced
5171:4e8b3c0ea78c 5172:2ac937ed383b
    19 # CDDL HEADER END
    19 # CDDL HEADER END
    20 #
    20 #
    21 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
    21 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
    22 #
    22 #
    23 
    23 
    24 APACHE_22_USR_PREFIX=/usr/apache2/2.2
    24 MODULES_CONFIGURE = $(CONFIGURE_64)
       
    25 MODULES_BUILD = $(BUILD_64)
       
    26 MODULES_INSTALL = $(INSTALL_64)
       
    27 MODULES_TEST = $(TEST_64)
       
    28 
    25 APACHE_24_USR_PREFIX=/usr/apache2/2.4
    29 APACHE_24_USR_PREFIX=/usr/apache2/2.4
    26 
    30 
    27 VARIANT_APACHE_22 =	$(BUILD_DIR)/apache22
       
    28 VARIANT_APACHE_24 =	$(BUILD_DIR)/apache24
    31 VARIANT_APACHE_24 =	$(BUILD_DIR)/apache24
    29 
    32 
    30 VARIANTS_32 = $(VARIANT_APACHE_22)
       
    31 VARIANTS_64 = $(VARIANT_APACHE_22) $(VARIANT_APACHE_24)
    33 VARIANTS_64 = $(VARIANT_APACHE_22) $(VARIANT_APACHE_24)
    32 
    34 
    33 BUILD_32 = $(VARIANTS_32:%=%/$(MACH32)/.built)
       
    34 BUILD_64 = $(VARIANTS_64:%=%/$(MACH64)/.built)
    35 BUILD_64 = $(VARIANTS_64:%=%/$(MACH64)/.built)
    35 
    36 
    36 INSTALL_32 = $(VARIANTS_32:%=%/$(MACH32)/.installed)
       
    37 INSTALL_64 = $(VARIANTS_64:%=%/$(MACH64)/.installed)
    37 INSTALL_64 = $(VARIANTS_64:%=%/$(MACH64)/.installed)
    38 
    38 
    39 TEST_32 = $(VARIANTS_32:%=%/$(MACH32)/.tested)
       
    40 TEST_64 = $(VARIANTS_64:%=%/$(MACH64)/.tested)
    39 TEST_64 = $(VARIANTS_64:%=%/$(MACH64)/.tested)
    41 
    40 
    42 $(VARIANT_APACHE_22)/$(MACH64)/.configured: BITS=64
       
    43 $(VARIANT_APACHE_24)/$(MACH64)/.configured: BITS=64
    41 $(VARIANT_APACHE_24)/$(MACH64)/.configured: BITS=64
    44 
    42 
    45 $(VARIANT_APACHE_22)/$(MACH64)/.built: BITS=64
       
    46 $(VARIANT_APACHE_24)/$(MACH64)/.built: BITS=64
    43 $(VARIANT_APACHE_24)/$(MACH64)/.built: BITS=64
    47 
    44 
    48 $(VARIANT_APACHE_22)/$(MACH64)/.tested: BITS=64
       
    49 $(VARIANT_APACHE_24)/$(MACH64)/.tested: BITS=64
    45 $(VARIANT_APACHE_24)/$(MACH64)/.tested: BITS=64
    50 
    46 
    51 $(VARIANT_APACHE_22)/%/.configured: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
       
    52 $(VARIANT_APACHE_24)/%/.configured: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
    47 $(VARIANT_APACHE_24)/%/.configured: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
    53 
    48 
    54 $(VARIANT_APACHE_22)/%/.built: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
       
    55 $(VARIANT_APACHE_24)/%/.built: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
    49 $(VARIANT_APACHE_24)/%/.built: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
    56 
    50 
    57 $(VARIANT_APACHE_22)/%/.installed: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
       
    58 $(VARIANT_APACHE_24)/%/.installed: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
    51 $(VARIANT_APACHE_24)/%/.installed: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
    59 
    52 
    60 $(BUILD_DIR)/apache22/$(MACH32)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
       
    61 $(BUILD_DIR)/apache22/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
       
    62 $(BUILD_DIR)/apache24/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
    53 $(BUILD_DIR)/apache24/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
    63 
    54 
    64 $(BUILD_DIR)/apache22/$(MACH32)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
       
    65 $(BUILD_DIR)/apache22/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
       
    66 $(BUILD_DIR)/apache24/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
    55 $(BUILD_DIR)/apache24/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
    67 
    56 
    68 DEFAULT_COMPILER?=yes
    57 DEFAULT_COMPILER?=yes
    69 
    58 
    70 ifeq   ($(strip $(DEFAULT_COMPILER)),no)
    59 ifeq   ($(strip $(DEFAULT_COMPILER)),no)
    75 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
    64 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
    76 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
    65 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
    77 PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
    66 PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
    78 endif
    67 endif
    79 
    68 
    80 REQUIRED_PACKAGES += web/server/apache-22
       
    81 REQUIRED_PACKAGES += web/server/apache-24
    69 REQUIRED_PACKAGES += web/server/apache-24