From 37e3bea32e9078168cd2622dcc976d7d10739088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 28 Apr 2015 07:57:53 +0200 Subject: Imported Upstream version 0.8.2 --- win32/MinGW/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'win32/MinGW/Makefile') diff --git a/win32/MinGW/Makefile b/win32/MinGW/Makefile index f570e7d..9dfd13f 100644 --- a/win32/MinGW/Makefile +++ b/win32/MinGW/Makefile @@ -41,7 +41,7 @@ CFLAGS = -Wall -Wextra -O3 -s TEST_DIR = ../../test CPP_TEST_DIR = ../CppTest -LIB_DIR = ../../lib +LIB_DIR = ../../src INCLUDE_DIR = ../../include WIN32_DIR = .. CC = gcc @@ -54,6 +54,8 @@ TEST_OBJECTS := $(patsubst %.cpp,%.o,$(wildcard $(CPP_TEST_DIR)/*.cpp)) \ LIBRARY = $(WIN32_DIR)/liburiparser.a TEST_SUITE = $(WIN32_DIR)/test.exe +all: $(LIBRARY) + $(LIBRARY): $(URIPARSER_OBJECTS) ar rcs $(LIBRARY) $(URIPARSER_OBJECTS) @@ -65,13 +67,17 @@ $(TEST_SUITE): $(LIBRARY) $(TEST_OBJECTS) -L$(WIN32_DIR) -luriparser -o $(TEST_SUITE) $(TEST_OBJECTS): %.o : %.cpp - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -c "$<" -o "$@" - -all: $(LIBRARY) + $(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -c "$<" -o "$@" clean: del $(call dos,$(URIPARSER_OBJECTS)) $(call dos,$(LIBRARY)) \ $(call dos,$(TEST_OBJECTS)) $(call dos,$(TEST_SUITE)) +clean-unix: + $(RM) $(URIPARSER_OBJECTS) $(LIBRARY) \ + $(TEST_OBJECTS) $(TEST_SUITE) + check: $(TEST_SUITE) $(TEST_SUITE) + +.PHONY: all check clean clean-unix -- cgit v1.2.3