|
Line
Link Here
|
| 0 |
-- Make/instrules |
0 |
++ Make/instrules |
|
Lines 28-34
Link Here
|
| 28 |
|
28 |
|
| 29 |
__inst_headers: |
29 |
__inst_headers: |
| 30 |
@[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads |
30 |
@[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads |
| 31 |
for f in include/OpenThreads/* ; do\ |
31 |
for f in include/OpenThreads/* ; do \ |
| 32 |
if [ ! -d $$f ];\ |
32 |
if [ ! -d $$f ];\ |
| 33 |
then\ |
33 |
then\ |
| 34 |
[ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-" ] && \ |
34 |
[ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-" ] && \ |
|
Lines 39-48
Link Here
|
| 39 |
|
39 |
|
| 40 |
|
40 |
|
| 41 |
__inst_share: |
41 |
__inst_share: |
| 42 |
@for d in `find share/ -type d -print | grep -v CVS`; do\ |
42 |
@for d in `find share/ -type d -print | grep -v CVS`; do \ |
| 43 |
[ -d $(INST_LOCATION)/$$d ] || mkdir -p $(INST_LOCATION)/$$d;\ |
43 |
[ -d $(INST_LOCATION)/$$d ] || mkdir -p $(INST_LOCATION)/$$d;\ |
| 44 |
done |
44 |
done |
| 45 |
@for f in `find share/ -type f -print | grep -v CVS`; do\ |
45 |
@for f in `find share/ -type f -print | grep -v CVS`; do \ |
| 46 |
$(INSTRCMD) $$f $(INST_LOCATION)/$$f;\ |
46 |
$(INSTRCMD) $$f $(INST_LOCATION)/$$f;\ |
| 47 |
done |
47 |
done |
| 48 |
|
48 |
|
| 49 |
-- Make/makedefs |
49 |
++ Make/makedefs |
|
Lines 68-75
Link Here
|
| 68 |
|
68 |
|
| 69 |
INC = -I$(TOPDIR)/include |
69 |
INC = -I$(TOPDIR)/include |
| 70 |
|
70 |
|
| 71 |
CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) |
71 |
CXXFLAGS += -Wall $(ARCHARGS) $(DEF) $(INC) |
| 72 |
LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) |
72 |
LDFLAGS += $(ARCHARGS) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) |
| 73 |
OBJS = $(CXXFILES:.cpp=.o) \ |
73 |
OBJS = $(CXXFILES:.cpp=.o) \ |
| 74 |
$(C++FILES:.c++=.o) \ |
74 |
$(C++FILES:.c++=.o) \ |
| 75 |
$(CFILES:.c=.o) \ |
75 |
$(CFILES:.c=.o) \ |
|
Lines 100-106
Link Here
|
| 100 |
INSTLINKCMD = $(LINK) |
100 |
INSTLINKCMD = $(LINK) |
| 101 |
|
101 |
|
| 102 |
LIB_PREFIX = lib |
102 |
LIB_PREFIX = lib |
| 103 |
LIB_EXT = so |
103 |
LIB_EXT = so.$(VERSION_MAJOR) |
| 104 |
|
104 |
|
| 105 |
MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" |
105 |
MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" |
| 106 |
INSTLOGFILE = /tmp/.openThreads_inst_log |
106 |
INSTLOGFILE = /tmp/.openThreads_inst_log |
|
Lines 227-235
Link Here
|
| 227 |
CXX = g++ |
227 |
CXX = g++ |
| 228 |
endif |
228 |
endif |
| 229 |
|
229 |
|
| 230 |
ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES") |
230 |
LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT) |
| 231 |
LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0 |
|
|
| 232 |
endif |
| 233 |
|
231 |
|
| 234 |
###DEF += -fPIC |
232 |
###DEF += -fPIC |
| 235 |
OPTF = -O2 |
233 |
OPTF = -O2 |
| 236 |
-- Make/makerules |
234 |
++ Make/makerules |
|
Lines 139-145
Link Here
|
| 139 |
else\ |
139 |
else\ |
| 140 |
depfiles="$?";\ |
140 |
depfiles="$?";\ |
| 141 |
fi;\ |
141 |
fi;\ |
| 142 |
if [ ! -z "$$depfiles" ]; then\ |
142 |
if [ ! -z "$$depfiles" ]; then \ |
| 143 |
for f in $$depfiles; do \ |
143 |
for f in $$depfiles; do \ |
| 144 |
echo "$(CXX) $(DEPARG) $(INC) $$f pipeto .depend/`basename $$f`"; \ |
144 |
echo "$(CXX) $(DEPARG) $(INC) $$f pipeto .depend/`basename $$f`"; \ |
| 145 |
$(CXX) $(DEPARG) $(INC) $$f > .depend/`basename $$f`; \ |
145 |
$(CXX) $(DEPARG) $(INC) $$f > .depend/`basename $$f`; \ |
