1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
diff -ru OpenThreads~/Make/makedefs OpenThreads/Make/makedefs
--- OpenThreads~/Make/makedefs 2006-09-10 00:03:38.000000000 +0200
+++ OpenThreads/Make/makedefs 2006-09-10 00:05:50.000000000 +0200
@@ -68,8 +68,8 @@
INC = -I$(TOPDIR)/include
-CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH)
+CXXFLAGS += -Wall $(ARCHARGS) $(DOF) $(DEF) $(INC)
+LDFLAGS += $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH)
OBJS = $(CXXFILES:.cpp=.o) \
$(C++FILES:.c++=.o) \
$(CFILES:.c=.o) \
@@ -100,7 +100,7 @@
INSTLINKCMD = $(LINK)
LIB_PREFIX = lib
-LIB_EXT = so
+LIB_EXT = so.$(VERSION)
MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n"
INSTLOGFILE = /tmp/.openThreads_inst_log
@@ -227,12 +227,12 @@
CXX = g++
endif
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
+#ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT)
+#endif
###DEF += -fPIC
- OPTF = -O2
+ #OPTF = -O2
DBGF = -ggdb -gstabs
ifeq ($(SYSARCH),x86_64)
ARCH = 64
@@ -251,9 +251,9 @@
SHARED = -shared
ARCHARGS =
ifeq ($(SYSARCH),x86_64)
- LINKARGS = -L/usr/X11R6/lib64
+ LINKARGS = -L/usr/lib64
else
- LINKARGS = -L/usr/X11R6/lib
+ LINKARGS = -L/usr/lib
endif
MAKEDIST = $(TOPDIR)/Make/makerpms
endif
|
GitWeb
