summaryrefslogtreecommitdiff
path: root/lib/Makefile.m32
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-05-22 09:05:10 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-06-14 11:07:33 +0200
commit73a2fcea0b4adea6ba342cd7ed1149782c214ae3 (patch)
tree096ddd19a67c16bf788c3b8743f11de9dd5fba92 /lib/Makefile.m32
parent54b636f14546d3fde9f9c67c3b32701d78563161 (diff)
downloadcurl-73a2fcea0b4adea6ba342cd7ed1149782c214ae3.tar.gz
includes: remove curl/curlbuild.h and curl/curlrules.h
Rely entirely on curl/system.h now. Introduced in Aug 2008 with commit 14240e9e109f. Now gone. Fixes #1456
Diffstat (limited to 'lib/Makefile.m32')
-rw-r--r--lib/Makefile.m3211
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 522dbd1df..8895dfd8a 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -340,24 +340,17 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
-Wl,--output-def,$(@:.dll=.def),--out-implib,$(libcurl_dll_a_LIBRARY) \
$(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS)
-%.o: %.c $(PROOT)/include/curl/curlbuild.h
+%.o: %.c
$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
%.res: %.rc
$(RC) $(RCFLAGS) -i $< -o $@
clean:
-ifeq "$(wildcard $(PROOT)/include/curl/curlbuild.h.dist)" "$(PROOT)/include/curl/curlbuild.h.dist"
- @$(call DEL, $(PROOT)/include/curl/curlbuild.h)
-endif
@$(call DEL, $(libcurl_a_OBJECTS) $(RESOURCE))
distclean vclean: clean
@$(call DEL, $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_LIBRARY:.dll=.def) $(libcurl_dll_a_LIBRARY))
-$(PROOT)/include/curl/curlbuild.h:
- @echo Creating $@
- @$(call COPY, $@.dist, $@)
-
$(LIBCARES_PATH)/libcares.a:
$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32