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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
$NetBSD: patch-ab,v 1.4 2005/05/17 06:26:40 veego Exp $
--- Makefile.in.orig 2001-06-15 12:06:35.000000000 +0200
+++ Makefile.in 2005-05-16 18:28:53.000000000 +0200
@@ -35,13 +35,13 @@
LIB_RUNTIME_DIR = $(exec_prefix)/lib
# Directory in which to install library files belonging to the extension.
-TNM_INSTALL_DIR = $(prefix)/lib/tnm$(TNM_VERSION)
+TNM_INSTALL_DIR = $(prefix)/lib/tcl/tnm$(TNM_VERSION)
# Directory in which to install library files belonging to the extension.
TCL_INSTALL_DIR = $(prefix)/lib/tcl$(TCL_VERSION)
# Directory in which to install the library of tkined scripts.
-TKI_INSTALL_DIR = $(prefix)/lib/tkined$(TKI_VERSION)
+TKI_INSTALL_DIR = $(prefix)/lib/tcl/tkined$(TKI_VERSION)
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(prefix)/man
@@ -82,7 +82,7 @@
# The full name of the tclsh executable (including the full path
# and the Tcl version number).
-TCL_TCLSH=$(TCL_EXEC_PREFIX)/bin/tclsh$(TCL_VERSION)
+TCL_TCLSH=$(TCL_EXEC_PREFIX)/bin/tclsh
# Top-level directory in which Tk's platform-specific files (e.g.
# executables) are installed.
@@ -90,7 +90,7 @@
# The full name of the wish executable (including the full path
# and the Tk version number).
-TK_WISH=$(TK_EXEC_PREFIX)/bin/wish$(TK_VERSION)
+TK_WISH=$(TK_EXEC_PREFIX)/bin/wish
# A "-I" switch that can be used when compiling to make all the
# Tcl include files accessible (the configure script will try to
@@ -197,8 +197,8 @@
# Flags to pass to the compiler to tell the run-time dynamic linker
# where to look for shared libraries.
-LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
-#LD_SEARCH_FLAGS =
+#LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+LD_SEARCH_FLAGS =
#----------------------------------------------------------------
# The information below is modified by the configure script when
@@ -207,8 +207,8 @@
#----------------------------------------------------------------
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
+INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
RPCGEN = @RPCGEN@
LEX = @LEX@
YACC = @YACC@
@@ -244,8 +244,8 @@
# either.
#----------------------------------------------------------------
-CC = @CC@
-LD = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
+LD = ${LIBTOOL} --mode=link @CC@
CC_SWITCHES = $(CFLAGS) $(PROTO_FLAGS) $(SHLIB_CFLAGS) $(MEM_DEBUG_FLAGS)
@@ -261,13 +261,14 @@
$(TNM_GENERIC_DIR)/tnmHttp.c $(TNM_GENERIC_DIR)/tnmNetdb.c \
$(UNIX_DIR)/tnmUnixInit.c $(UNIX_DIR)/tnmUnixLog.c \
$(UNIX_DIR)/tnmUnixSocket.c $(UNIX_DIR)/tnmUnixIcmp.c
-TNM_GENERIC_OBJS = tnmInit.o tnmUtil.o tnmJob.o tnmIned.o \
+TNM_GENERIC_OBJS = tnmJob.o tnmIned.o \
tnmSyslog.o tnmIcmp.o tnmDns.o tnmEvent.o \
tnmUdp.o tnmSunRpc.o tnmNtp.o tnmRpc.o tnmHttp.o \
tnmNetdb.o tnmUnixInit.o tnmUnixLog.o \
tnmUnixSocket.o tnmUnixIcmp.o \
mount_clnt.o mount_xdr.o ether_clnt.o ether_xdr.o \
- rstat_clnt.o rstat_xdr.o pcnfsd_clnt.o pcnfsd_xdr.o
+ rstat_clnt.o rstat_xdr.o pcnfsd_clnt.o pcnfsd_xdr.o \
+ tnmInit.o tnmUtil.o
SNMP_SRCS = $(TNM_SNMP_DIR)/tnmAsn1.c $(TNM_SNMP_DIR)/tnmMD5.c \
$(TNM_SNMP_DIR)/tnmSnmpNet.c $(TNM_SNMP_DIR)/tnmSnmpUtil.c \
@@ -406,21 +407,23 @@
all: @TARGET@
-scotty: tnm$(SHLIB_SUFFIX) ntping straps scotty.o
+scotty: libtnm$(SHLIB_SUFFIX) ntping straps scotty.o
$(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
-tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
- $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS) $(OSIMIS_LIBS) $(MSQL_LIBS) $(GDMO_LIBS)
+libtnm$(SHLIB_SUFFIX): $(TNM_OBJS)
+ ${LIBTOOL} --mode=link @CC@ $(TNM_OBJS:.o=.lo) -o libtnm${SHLIB_SUFFIX:C/\.so.*/.la/} \
+ -Wl,-R${PREFIX}/lib $(LIBS) $(OSIMIS_LIBS) $(MSQL_LIBS) $(GDMO_LIBS) $(TCL_LIB_SPEC) -lm -rpath ${PREFIX}/lib -version-info 1:0
-tkined: tkined$(SHLIB_SUFFIX) $(UNIX_DIR)/tkined.in
+tkined: libtkined$(SHLIB_SUFFIX) $(UNIX_DIR)/tkined.in
@sed -e 's+%WISH%+$(TK_WISH)+' \
-e 's+%TCL_VERSION%+$(TCL_VERSION)+' \
-e 's+%TK_VERSION%+$(TK_VERSION)+' \
-e 's+%TKI_VERSION%+$(TKI_VERSION)+' \
$(UNIX_DIR)/tkined.in > tkined
-tkined$(SHLIB_SUFFIX): $(TKI_GENERIC_OBJS)
- $(SHLIB_LD) $(TKI_GENERIC_OBJS) -o tkined$(SHLIB_SUFFIX) $(LIBS)
+libtkined$(SHLIB_SUFFIX): $(TKI_OBJS)
+ ${LIBTOOL} --mode=link @CC@ $(TKI_OBJS:.o=.lo) -o libtkined${SHLIB_SUFFIX:C/\.so.*/.la/} \
+ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -L${PREFIX}/lib -L${X11BASE}/lib $(LIBS) -ltnm -ltk -ltcl -lX11 -lm -rpath ${PREFIX}/lib:${X11BASE}/lib -version-info 1:0
test:
@echo
@@ -495,7 +498,7 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
-tnm-install-bin: scotty tnm$(SHLIB_SUFFIX)
+tnm-install-bin: scotty libtnm$(SHLIB_SUFFIX)
@for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TNM_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -505,11 +508,10 @@
else true; \
fi; \
done;
- @echo "Installing scotty$(TNM_VERSION) and tnm$(TNM_VERSION)$(SHLIB_SUFFIX)"
+ @echo "Installing scotty$(TNM_VERSION) and libtnm$(SHLIB_SUFFIX)"
@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
- @$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
- @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
+ @$(INSTALL_DATA) libtnm$(SHLIB_SUFFIX:C/\.so.*/.la/) $(LIB_RUNTIME_DIR)
+ @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/libtnm[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
tnm-install-mibs:
@for i in $(TNM_INSTALL_DIR)/mibs ; \
@@ -597,7 +599,7 @@
$(INSTALL_DATA) $$i $(TNM_INSTALL_DIR)/agents; \
done
-tki-install-bin: tkined tkined$(SHLIB_SUFFIX) $(TKI_LIBRARY_DIR)/pkgIndex.tcl
+tki-install-bin: tkined libtkined$(SHLIB_SUFFIX) $(TKI_LIBRARY_DIR)/pkgIndex.tcl
@for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TKI_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -607,11 +609,10 @@
else true; \
fi; \
done;
- @echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
- @$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
- @$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
- @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
+ @echo "Installing tkined$(TKI_VERSION) and libtkined$(SHLIB_SUFFIX)"
+ $(BSD_INSTALL_SCRIPT) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
+ $(INSTALL_DATA) libtkined$(SHLIB_SUFFIX:C/\.so.*/.la/) $(LIB_RUNTIME_DIR)
+ @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/libtkined[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
tki-install-library:
@@ -696,9 +697,9 @@
uninstall: tnm-uninstall uninstall-man tki-uninstall
tnm-uninstall:
- @echo "Removing scotty$(TNM_VERSION) and tnm$(TNM_VERSION)$(SHLIB_SUFFIX)"
+ @echo "Removing scotty$(TNM_VERSION) and libtnm$(SHLIB_SUFFIX)"
@rm -f $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
- @rm -f $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
+ @rm -f $(LIB_RUNTIME_DIR)/libtnm$(SHLIB_SUFFIX)
@for i in $(LIB_INSTALL_DIR)/tnm$(TNM_VERSION)/* ; \
do \
if [ "`basename $$i`" != "site" ] ; then \
@@ -713,9 +714,9 @@
fi
tki-uninstall:
- @echo "Removing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
+ @echo "Removing tkined$(TNM_VERSION) and libtkined$(SHLIB_SUFFIX)"
@rm -f $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
- @rm -f $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
+ @rm -f $(LIB_RUNTIME_DIR)/libtkined$(SHLIB_SUFFIX)
@for i in $(LIB_INSTALL_DIR)/tkined$(TKI_VERSION)/* ; \
do \
if [ "`basename $$i`" != "site" ] ; then \
@@ -750,7 +751,7 @@
@rm -f $(TNM_OBJS) $(TKI_OBJS) scotty.o ntping.o straps.o
@rm -f tnmGdmoScan.c tnmGdmoParser.c tnmGdmoParser.h
@rm -f scotty ntping straps tkined
- @rm -f tnm$(SHLIB_SUFFIX) tkined$(SHLIB_SUFFIX)
+ @rm -f libtnm$(SHLIB_SUFFIX) libtkined$(SHLIB_SUFFIX)
@rm -f core *_svc.c *~ *.bak so_locations lmake.???
@rm -f map.so tnmMap.o tnmMapUtil.o
@rm -f tnmMapNode.o tnmMapClnt.o tnmMapAppl.o
@@ -821,8 +822,8 @@
$(MAN8_INSTALL_DIR)/straps.8 \
$(BIN_INSTALL_DIR)/ntping \
$(MAN8_INSTALL_DIR)/ntping.8 \
- $(LIB_RUNTIME_DIR)/tkined$(SHLIB_SUFFIX) \
- $(LIB_RUNTIME_DIR)/tnm$(SHLIB_SUFFIX) \
+ $(LIB_RUNTIME_DIR)/libtkined$(SHLIB_SUFFIX) \
+ $(LIB_RUNTIME_DIR)/libtnm$(SHLIB_SUFFIX) \
$(TNM_INSTALL_DIR) $(TKI_INSTALL_DIR)
bintar:
|
