diff options
| author | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2015-04-28 07:57:55 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2015-04-28 07:57:55 +0200 |
| commit | 950148753b2eb4be3f5e63a68b3b3b9f36ea771b (patch) | |
| tree | 48d0e21ea28a9d7c862ba2ecc04ac04acb02d567 /win32 | |
| parent | 3aa8ef714e64554d4bae7139d8e8df90bf57201e (diff) | |
| parent | 37e3bea32e9078168cd2622dcc976d7d10739088 (diff) | |
Merge tag 'upstream/0.8.2'
Upstream version 0.8.2
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/MinGW/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
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 |