summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorrpj <rpj>2005-04-01 09:00:27 +0000
committerrpj <rpj>2005-04-01 09:00:27 +0000
commitf7d9daf2243a111623aff7856b24632ef49cefcc (patch)
tree8bc4fabc31812fb64d2d4ac558f07908757b01a6 /GNUmakefile
parentf6f9976af7a520dd1aeced4f104f4d4711f28e23 (diff)
''
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 9e6be70..18181e4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,7 +29,7 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
-DLL_VER = 2
+DLL_VER = 1
DEVROOT = C:\PTHREADS
@@ -427,6 +427,7 @@ GCE_INLINED_STAMP = pthreadGCE$(DLL_VER).stamp
GC_DLL = pthreadGC$(DLL_VER).dll
GC_LIB = libpthreadGC$(DLL_VER).a
GC_INLINED_STAMP = pthreadGC$(DLL_VER).stamp
+GC_STATIC_STAMP = libpthreadGC$(DLL_VER).stamp
PTHREAD_DEF = pthread.def
@@ -436,6 +437,7 @@ help:
@ echo "make clean GC (to build the GNU C dll with C cleanup code)"
@ echo "make clean GCE-inlined (to build the GNU C inlined dll with C++ exception handling)"
@ echo "make clean GC-inlined (to build the GNU C inlined dll with C cleanup code)"
+ @ echo "make clean GC-static (to build the GNU C inlined static lib with C cleanup code)"
all:
@ $(MAKE) clean GCE
@@ -453,6 +455,9 @@ GC-inlined:
GCE-inlined:
$(MAKE) CC=g++ XOPT="-DPTW32_BUILD_INLINED" CLEANUP=-D__CLEANUP_CXX XC_FLAGS="$(GCE_CFLAGS)" OBJ="$(DLL_INLINED_OBJS)" $(GCE_INLINED_STAMP)
+GC-static:
+ $(MAKE) CC=gcc XOPT="-DPTW32_BUILD_INLINED -DPTW32_STATIC_LIB" CLEANUP=-D__CLEANUP_C XC_FLAGS="$(GC_CFLAGS)" OBJ="$(DLL_INLINED_OBJS)" $(GC_STATIC_STAMP)
+
tests:
@ cd tests
@ $(MAKE) auto
@@ -493,6 +498,11 @@ $(GCE_INLINED_STAMP): $(DLL_INLINED_OBJS)
dlltool -k --dllname $(GCE_DLL) --output-lib $(GCE_LIB) --def $(PTHREAD_DEF)
echo touched > $(GCE_INLINED_STAMP)
+$(GC_STATIC_STAMP): $(DLL_INLINED_OBJS)
+ $(RM) $(GC_LIB)
+ $(AR) -rv $(GC_LIB) $(DLL_INLINED_OBJS)
+ echo touched > $(GC_STATIC_STAMP)
+
clean:
-$(RM) *~
-$(RM) *.i