BUILD: addons: convert WURFL addon to EXTRA_MAKE

Move the WURFL Makefile part to addons/wurfl/Makefile.mk so it can be
used with EXTRA_MAKE and allow to cleanup the main Makefile.

Shouldn't have impact on the build system, every build variable
previously used are the same.

diff --git a/Makefile b/Makefile
index ff72d0f95c44d9b56f885c9fdd824760abc5becb..db1fed0a94de26a4a600caf2f942f4f8702d9fe7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -730,19 +730,7 @@ ifneq ($(USE_51DEGREES:0=),)
 endif # USE_51DEGREES
 
 ifneq ($(USE_WURFL:0=),)
-  # Use WURFL_SRC and possibly WURFL_INC and WURFL_LIB to force path
-  # to WURFL headers and libraries if needed.
-  WURFL_INC = $(WURFL_SRC)
-  WURFL_LIB = $(WURFL_SRC)
-  OPTIONS_OBJS    += addons/wurfl/wurfl.o
-  WURFL_CFLAGS     = $(if $(WURFL_INC),-I$(WURFL_INC))
-  ifneq ($(WURFL_DEBUG),)
-    WURFL_CFLAGS  += -DWURFL_DEBUG
-  endif
-  ifneq ($(WURFL_HEADER_WITH_DETAILS),)
-    WURFL_CFLAGS  += -DWURFL_HEADER_WITH_DETAILS
-  endif
-  WURFL_LDFLAGS    = $(if $(WURFL_LIB),-L$(WURFL_LIB)) -lwurfl
+  EXTRA_MAKE += addons/wurfl
 endif
 
 ifneq ($(USE_PCRE:0=)$(USE_STATIC_PCRE:0=)$(USE_PCRE_JIT:0=),)

diff --git a/addons/wurfl/Makefile.mk b/addons/wurfl/Makefile.mk
new file mode 100644 (file)
index 0000000..51a574f
--- /dev/null
+++ b/addons/wurfl/Makefile.mk
@@ -0,0 +1,13 @@
+# Use WURFL_SRC and possibly WURFL_INC and WURFL_LIB to force path
+# to WURFL headers and libraries if needed.
+WURFL_INC = $(WURFL_SRC)
+WURFL_LIB = $(WURFL_SRC)
+OPTIONS_OBJS    += addons/wurfl/wurfl.o
+WURFL_CFLAGS     = $(if $(WURFL_INC),-I$(WURFL_INC))
+ifneq ($(WURFL_DEBUG),)
+  WURFL_CFLAGS  += -DWURFL_DEBUG
+endif
+ifneq ($(WURFL_HEADER_WITH_DETAILS),)
+  WURFL_CFLAGS  += -DWURFL_HEADER_WITH_DETAILS
+endif
+WURFL_LDFLAGS    = $(if $(WURFL_LIB),-L$(WURFL_LIB)) -lwurfl