lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-08-16 11:21:57 +03:00
Code Activity

Fixed the md5 code inclusion in the build

Browse Source
This commit is contained in:
Thomas Davis
2013-08-20 15:53:51 -04:00
parent be9b132a3a
commit 4fc63e059c
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -65,7 +65,7 @@ YASSL_SOURCES = \
$(YASSL)/ctaocrypt/src/ecc.c $(YASSL)/src/ocsp.c $(YASSL)/src/crl.c \ $(YASSL)/ctaocrypt/src/ecc.c $(YASSL)/src/ocsp.c $(YASSL)/src/crl.c \
$(YASSL)/ctaocrypt/src/hc128.c $(YASSL)/ctaocrypt/src/memory.c $(YASSL)/ctaocrypt/src/hc128.c $(YASSL)/ctaocrypt/src/memory.c
LIB_SOURCES = civetweb.c build/md5.c LIB_SOURCES = civetweb.c md5.c
ALL_SOURCES = main.c $(LIB_SOURCES) build/sqlite3.c build/lsqlite3.c \ ALL_SOURCES = main.c $(LIB_SOURCES) build/sqlite3.c build/lsqlite3.c \
$(LUA_SOURCES) $(YASSL_SOURCES) $(LUA_SOURCES) $(YASSL_SOURCES)

2
civetweb.c
View File

@@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#include "build/md5.h" #include "md5.h"
#if defined(_WIN32) #if defined(_WIN32)
#if !defined(_CRT_SECURE_NO_WARNINGS) #if !defined(_CRT_SECURE_NO_WARNINGS)

2
cpp/Makefile
View File

@@ -4,7 +4,7 @@
# #
CFLAGS= -W -Wall -Wno-unused-parameter -I.. -I. -g CFLAGS= -W -Wall -Wno-unused-parameter -I.. -I. -g
LIB_SOURCES = CivetServer.cpp ../civetweb.c ../build/md5.c LIB_SOURCES = CivetServer.cpp ../civetweb.c ../md5.c
LIBS = -lpthread LIBS = -lpthread
all: all:

22
examples/Makefile
View File

@@ -1,13 +1,13 @@
CFLAGS= -W -Wall -I.. -pthread -g CFLAGS= -W -Wall -I.. -pthread -g
LIB_SOURCE = ../civetweb.c ../md5.c
all: all:
OS=`uname`; \ OS=`uname`; \
test "$$OS" = Linux && LIBS="-ldl" ; \ test "$$OS" = Linux && LIBS="-ldl" ; \
$(CC) $(CFLAGS) hello.c ../civetweb.c $$LIBS $(ADD) -o hello; $(CC) $(CFLAGS) hello.c $(LIB_SOURCE) $$LIBS $(ADD) -o hello;
$(CC) $(CFLAGS) upload.c ../civetweb.c $$LIBS $(ADD) -o upload; $(CC) $(CFLAGS) upload.c $(LIB_SOURCE) $$LIBS $(ADD) -o upload;
$(CC) $(CFLAGS) post.c ../civetweb.c $$LIBS $(ADD) -o post; $(CC) $(CFLAGS) post.c $(LIB_SOURCE) $$LIBS $(ADD) -o post;
$(CC) $(CFLAGS) -DUSE_WEBSOCKET websocket.c ../civetweb.c $$LIBS $(ADD) -o websocket; $(CC) $(CFLAGS) -DUSE_WEBSOCKET websocket.c $(LIB_SOURCE) $$LIBS $(ADD) -o websocket;
$(CC) $(CFLAGS) chat.c ../civetweb.c $$LIBS $(ADD) -o chat $(CC) $(CFLAGS) chat.c $(LIB_SOURCE) $$LIBS $(ADD) -o chat
MSVC = e:/vc6 MSVC = e:/vc6
@@ -17,11 +17,11 @@ CLFLAGS = /MD /TC /nologo $(DBG) /W3 /DNO_SSL \
/link /incremental:no /libpath:$(MSVC)/lib /machine:IX86 /link /incremental:no /libpath:$(MSVC)/lib /machine:IX86
windows: windows:
$(CL) upload.c ../civetweb.c $(CLFLAGS) $(CL) upload.c $(LIB_SOURCE) $(CLFLAGS)
$(CL) hello.c ../civetweb.c $(CLFLAGS) $(CL) hello.c $(LIB_SOURCE) $(CLFLAGS)
$(CL) upload.c ../civetweb.c $(CLFLAGS) $(CL) upload.c $(LIB_SOURCE) $(CLFLAGS)
$(CL) post.c ../civetweb.c $(CLFLAGS) $(CL) post.c $(LIB_SOURCE) $(CLFLAGS)
$(CL) post.c ../civetweb.c $(CLFLAGS) $(CL) post.c $(LIB_SOURCE) $(CLFLAGS)
$(CL) /DUSE_WEBSOCKET websocket.c ../civetweb.c $(CLFLAGS) $(CL) /DUSE_WEBSOCKET websocket.c ../civetweb.c $(CLFLAGS)
clean: clean:

0
build/md5.c → md5.c
View File

0
build/md5.h → md5.h
View File