4a80b43eb6
PR: 46860 Submitted by: phil@nixil.org (Phil Oleson)
42 lines
1.1 KiB
Text
42 lines
1.1 KiB
Text
--- src/Makefile.common.orig Wed Jan 8 03:12:14 2003
|
|
+++ src/Makefile.common Wed Jan 8 03:13:59 2003
|
|
@@ -20,17 +20,17 @@
|
|
|
|
RANLIB = ranlib
|
|
|
|
-CXXDEFS = -DDEBUG
|
|
+CXXDEFS =
|
|
|
|
INCDIR = ../include
|
|
|
|
-CXXFLAGS = $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -fPIC -Wall -O2
|
|
+CXXFLAGS = $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -fPIC -Wall $(CFLAGS)
|
|
|
|
LIBNAME = libptypes.a
|
|
LIBDEST = ../lib
|
|
|
|
SONAME = libptypes.$(SOEXT)
|
|
-SOVER = 1
|
|
+SOVER = $(SHLIB_VER)
|
|
SOREALNAME = $(SONAME).$(SOVER)
|
|
SODEST = ../so
|
|
|
|
@@ -74,7 +74,7 @@
|
|
cp $@ $(LIBDEST)/
|
|
|
|
$(SOREALNAME): $(LIBOBJS)
|
|
- $(LIBTOOL) $(LIBOBJS) $(LDLIBS) -o $@
|
|
+ $(LIBTOOL) $(LIBOBJS) $(LDLIBS) -o $@ ${PTHREAD_LIBS} -lc_r
|
|
rm -f $(SONAME) ; ln -s $@ $(SONAME)
|
|
cp $@ $(SODEST)/
|
|
cd $(SODEST) ; rm -f $(SONAME) ; ln -s $@ $(SONAME) ; $(SOSTRIP) $@
|
|
@@ -190,7 +190,8 @@
|
|
ptypes_test.o: ptypes_test.cxx $(HALL)
|
|
|
|
ptypes_test: ptypes_test.o $(LIBNAME)
|
|
- $(CXX) $(CXXFLAGS) $@.o -L./ $(LDLIBS) libptypes.a -o $@
|
|
+ $(CXX) $(CXXFLAGS) $@.o -L./ $(LDLIBS) libptypes.a -o $@ \
|
|
+ $(PTHREAD_LIBS) -lc_r
|
|
|
|
clean: clean-src
|
|
rm -f $(LIBDEST)/$(LIBNAME)
|