[package] uhttpd: reorder compiler flags to fix native build on Ubuntu 11.x

[openwrt.git] / package / uhttpd / src / Makefile

diff --git a/package/uhttpd/src/Makefile b/package/uhttpd/src/Makefile
index 06d61bd..2b08ec6 100644 (file)
--- a/package/uhttpd/src/Makefile
+++ b/package/uhttpd/src/Makefile
@@ -1,29 +1,55 @@
 CGI_SUPPORT ?= 1
 LUA_SUPPORT ?= 1
 TLS_SUPPORT ?= 1
 CGI_SUPPORT ?= 1
 LUA_SUPPORT ?= 1
 TLS_SUPPORT ?= 1

+UHTTPD_TLS ?= cyassl

 
 

-CFLAGS ?= -I./lua-5.1.4/src -I./cyassl-1.4.0/include -O0 -ggdb3
-LDFLAGS ?= -L./lua-5.1.4/src -L./cyassl-1.4.0/src/.libs
+CFLAGS ?= -I./lua-5.1.4/src $(TLS_CFLAGS) -O0 -ggdb3
+LDFLAGS ?= -L./lua-5.1.4/src

 
 CFLAGS += -Wall --std=gnu99
 
 
 CFLAGS += -Wall --std=gnu99
 

-OBJ = uhttpd.o uhttpd-file.o uhttpd-utils.o
-LIB = -Wl,--export-dynamic -lcrypt -ldl
+ifeq ($(UHTTPD_TLS),openssl)
+  TLS_LDFLAGS ?= -L./openssl-0.9.8m -lssl
+  TLS_CFLAGS ?= -I./openssl-0.9.8m/include -DTLS_IS_OPENSSL
+else
+  TLS_LDFLAGS ?= -L./cyassl-1.4.0/src/.libs -lcyassl
+  TLS_CFLAGS ?= -I./cyassl-1.4.0/include -DTLS_IS_CYASSL
+endif

 
 

-TLSLIB =
-LUALIB =
+OBJ := uhttpd.o uhttpd-file.o uhttpd-utils.o
+LIB := -Wl,--export-dynamic -lcrypt -ldl

 
 

+TLSLIB :=
+LUALIB :=

 
 

-world: compile
+HAVE_SHADOW=$(shell echo 'int main(void){ return !getspnam("root"); }' | \
+       $(CC) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes)
+
+ifeq ($(HAVE_SHADOW),yes)
+  CFLAGS += -DHAVE_SHADOW
+endif
+
+ifeq ($(TLS_SUPPORT),1)
+  CFLAGS += -DHAVE_TLS
+endif

 
 ifeq ($(CGI_SUPPORT),1)
 
 ifeq ($(CGI_SUPPORT),1)

-  OBJ += uhttpd-cgi.o

   CFLAGS += -DHAVE_CGI
 endif
 
 ifeq ($(LUA_SUPPORT),1)
   CFLAGS += -DHAVE_LUA
   CFLAGS += -DHAVE_CGI
 endif
 
 ifeq ($(LUA_SUPPORT),1)
   CFLAGS += -DHAVE_LUA

-  LUALIB = uhttpd_lua.so
+endif
+
+
+world: compile
+
+ifeq ($(CGI_SUPPORT),1)
+  OBJ += uhttpd-cgi.o
+endif
+
+ifeq ($(LUA_SUPPORT),1)
+  LUALIB := uhttpd_lua.so

 
   $(LUALIB): uhttpd-lua.c
                $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \
 
   $(LUALIB): uhttpd-lua.c
                $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \


@@ -32,12 +58,11 @@ ifeq ($(LUA_SUPPORT),1)
 endif
 
 ifeq ($(TLS_SUPPORT),1)
 endif
 
 ifeq ($(TLS_SUPPORT),1)

-  CFLAGS += -DHAVE_TLS
-  TLSLIB = uhttpd_tls.so
+  TLSLIB := uhttpd_tls.so

 
   $(TLSLIB): uhttpd-tls.c
                $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \
 
   $(TLSLIB): uhttpd-tls.c
                $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \

-                       -shared -lcyassl \
+                       -shared $(TLS_LDFLAGS) \

                        -o $(TLSLIB) uhttpd-tls.c
 endif
 
                        -o $(TLSLIB) uhttpd-tls.c
 endif
 


@@ -45,8 +70,7 @@ endif
        $(CC) $(CFLAGS) -c -o $@ $<
 
 compile: $(OBJ) $(TLSLIB) $(LUALIB)
        $(CC) $(CFLAGS) -c -o $@ $<
 
 compile: $(OBJ) $(TLSLIB) $(LUALIB)

-       $(CC) -o uhttpd $(LDFLAGS) $(LIB) $(OBJ)
+       $(CC) -o uhttpd $(LDFLAGS) $(OBJ) $(LIB)

 
 clean:
        rm -f *.o *.so uhttpd
 
 clean:
        rm -f *.o *.so uhttpd

-