diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2011-08-09 19:26:42 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2016-11-04 08:58:49 +0300 |
| commit | e59984dca3309a54d6016f458470737bc15e3ea1 (patch) | |
| tree | 342dae924222c89bdc9d89a61753e516b42d0aa3 | |
| parent | 7916fa825e33b7f674b7856bff661764cf6ae668 (diff) | |
| download | libatomic_ops-e59984dca3309a54d6016f458470737bc15e3ea1.tar.gz | |
Makefile.msft: exclude 'check' from nmake all
(Cherry-pick part of commit d21a5af from 'release-7_4' branch.)
* src/Makefile.msft (all): Build "libatomic_ops_gpl.lib" instead of
"check".
* src/Makefile.msft (test_malloc): Wrap long lines.
| -rw-r--r-- | src/Makefile.msft | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.msft b/src/Makefile.msft index ae96702..16aa30a 100644 --- a/src/Makefile.msft +++ b/src/Makefile.msft @@ -1,6 +1,6 @@ # # Copyright (c) 2003-2005 Hewlett-Packard Development Company, L.P. -# +# # The really trivial win32/VC++ Makefile. Note that atomic_ops.c isn't useful. # And we rely on a pre-built test_atomic_include.h and generalize-small.h, # since we can't rely on sed. @@ -14,7 +14,7 @@ LIB_OBJS=atomic_ops_stack.obj atomic_ops_malloc.obj -all: check +all: libatomic_ops_gpl.lib atomic_ops_stack.obj: cl -O2 -c -DAO_ASSUME_WINDOWS98 atomic_ops_stack.c @@ -29,8 +29,9 @@ test_atomic_w95: ..\tests\test_atomic.c ..\tests\test_atomic_include.h cl -O2 -I. ..\tests\test_atomic.c -o test_atomic_w95 test_malloc: ..\tests\test_malloc.c ..\tests\test_atomic_include.h \ - libatomic_ops_gpl.lib - cl -O2 -DAO_ASSUME_WINDOWS98 -I. ..\tests\test_malloc.c -o test_malloc libatomic_ops_gpl.lib + libatomic_ops_gpl.lib + cl -O2 -DAO_ASSUME_WINDOWS98 -I. ..\tests\test_malloc.c \ + -o test_malloc libatomic_ops_gpl.lib libatomic_ops_gpl.lib: $(LIB_OBJS) lib /MACHINE:i386 /out:libatomic_ops_gpl.lib $(LIB_OBJS) @@ -41,5 +42,3 @@ check: test_atomic test_atomic_w95 test_malloc echo The following will print some \"Missing ...\" messages. test_atomic test_malloc - - |