Kaynağa Gözat

Fixed the md5 code inclusion in the build

Thomas Davis 12 yıl önce
ebeveyn
işleme
4fc63e059c
6 değiştirilmiş dosya ile 14 ekleme ve 14 silme
  1. 1 1
      Makefile
  2. 1 1
      civetweb.c
  3. 1 1
      cpp/Makefile
  4. 11 11
      examples/Makefile
  5. 0 0
      md5.c
  6. 0 0
      md5.h

+ 1 - 1
Makefile

@@ -65,7 +65,7 @@ YASSL_SOURCES = \
   $(YASSL)/ctaocrypt/src/ecc.c $(YASSL)/src/ocsp.c $(YASSL)/src/crl.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 \
               $(LUA_SOURCES) $(YASSL_SOURCES)

+ 1 - 1
civetweb.c

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

+ 1 - 1
cpp/Makefile

@@ -4,7 +4,7 @@
 #
 
 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 
 
 all:

+ 11 - 11
examples/Makefile

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

+ 0 - 0
build/md5.c → md5.c


+ 0 - 0
build/md5.h → md5.h