aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/Makefile.in16
2 files changed, 13 insertions, 7 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 524cc51..4209488 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 16 15:24:45 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * Makefile.in: Make import library creation 'make -j2' friendly.
+
Thu Nov 16 10:28:00 2000 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (uinfo_init): Call `cygwin_set_impersonation_token' to
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index b65e212..073019e 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -175,16 +175,18 @@ maintainer-clean realclean: clean
# Rule to build libcygwin.a
$(LIB_NAME): $(DEF_FILE) $(LIBCOS)
- $(DLLTOOL) --as=$(AS) --dllname $(DLL_NAME) --def $(DEF_FILE) --output-lib temp.a
- $(AR) rcv temp.a $(LIBCOS)
- mv temp.a $(LIB_NAME)
+ $(DLLTOOL) --as=$(AS) --dllname $(DLL_NAME) --def $(DEF_FILE) --output-lib templib.a
+ $(AR) rcv templib.a $(LIBCOS)
+ mv templib.a $(LIB_NAME)
# Rule to make stub library used by testsuite
-new-$(LIB_NAME): $(DEF_FILE) $(LIBCOS)
- $(DLLTOOL) --as=$(AS) --dllname new-$(DLL_NAME) --def $(DEF_FILE) --output-lib temp.a
- $(AR) rcv temp.a $(LIBCOS)
- mv temp.a new-$(LIB_NAME)
+# dependency set to $(LIB_NAME) to accomodate make -j2.
+# Otherwise dlltool gets confused. cgf (11-16-2000)
+new-$(LIB_NAME): $(LIB_NAME)
+ $(DLLTOOL) --as=$(AS) --dllname new-$(DLL_NAME) --def $(DEF_FILE) --output-lib new-templib.a
+ $(AR) rcv new-temp.a $(LIBCOS)
+ mv new-templib.a new-$(LIB_NAME)
# Rule to build cygwin.dll