Lines 1-6
Link Here
|
1 |
--- Makefile.in.orig 2007-05-14 10:26:14.000000000 -0700 |
1 |
--- Makefile.in.orig 2020-12-28 20:55:00 UTC |
2 |
+++ Makefile.in 2019-06-11 15:24:34.190572000 -0700 |
2 |
+++ Makefile.in |
3 |
@@ -41,7 +41,7 @@ LIBRARY = lib$(MODULE).a |
3 |
@@ -42,7 +42,7 @@ LIBRARY = lib$(MODULE).a |
4 |
|
4 |
|
5 |
# thread version of the library |
5 |
# thread version of the library |
6 |
LIB_TH = lib$(MODULE)th.a |
6 |
LIB_TH = lib$(MODULE)th.a |
Lines 9-15
Link Here
|
9 |
@TH_ON@BUILD_ALL_1 = threads |
9 |
@TH_ON@BUILD_ALL_1 = threads |
10 |
@TH_ON@INSTALL_LIB_1 = installth |
10 |
@TH_ON@INSTALL_LIB_1 = installth |
11 |
@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL) |
11 |
@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL) |
12 |
@@ -51,7 +51,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@ |
12 |
@@ -52,7 +52,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@ |
13 |
|
13 |
|
14 |
# C++ version of the library |
14 |
# C++ version of the library |
15 |
LIB_CXX = lib$(MODULE)xx.a |
15 |
LIB_CXX = lib$(MODULE)xx.a |
Lines 18-24
Link Here
|
18 |
@CXX_ON@BUILD_ALL_3 = $(LIB_CXX) |
18 |
@CXX_ON@BUILD_ALL_3 = $(LIB_CXX) |
19 |
@CXX_ON@INSTALL_LIB_3 = installcxx |
19 |
@CXX_ON@INSTALL_LIB_3 = installcxx |
20 |
@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL) |
20 |
@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL) |
21 |
@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ |
21 |
@@ -62,7 +62,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ |
22 |
|
22 |
|
23 |
# threads + C++ |
23 |
# threads + C++ |
24 |
LIB_TH_CXX = lib$(MODULE)thcxx.a |
24 |
LIB_TH_CXX = lib$(MODULE)thcxx.a |
Lines 27-33
Link Here
|
27 |
@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX) |
27 |
@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX) |
28 |
@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx |
28 |
@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx |
29 |
@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX) |
29 |
@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX) |
30 |
@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@ |
30 |
@@ -77,7 +77,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@ |
31 |
@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl |
31 |
@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl |
32 |
|
32 |
|
33 |
# shared versions of the libraries |
33 |
# shared versions of the libraries |
Lines 36-42
Link Here
|
36 |
@SL_ON@BUILD_ALL_7 = $(LIB_SL) |
36 |
@SL_ON@BUILD_ALL_7 = $(LIB_SL) |
37 |
@SL_ON@INSTALL_LIB_7 = installsl |
37 |
@SL_ON@INSTALL_LIB_7 = installsl |
38 |
@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL) |
38 |
@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL) |
39 |
@@ -218,7 +218,6 @@ installsl : $(LIB_SL) |
39 |
@@ -226,7 +226,6 @@ installsl : $(LIB_SL) |
40 |
installlib : $(INSTALL_LIB) |
40 |
installlib : $(INSTALL_LIB) |
41 |
$(srcdir)/mkinstalldirs $(libdir) |
41 |
$(srcdir)/mkinstalldirs $(libdir) |
42 |
$(INSTALL_PROGRAM) $(LIBRARY) $(libdir) |
42 |
$(INSTALL_PROGRAM) $(LIBRARY) $(libdir) |
Lines 44-97
Link Here
|
44 |
@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" |
44 |
@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" |
45 |
@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" |
45 |
@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" |
46 |
@TH_OFF@ @echo "Enter 'make installth' to install thread library" |
46 |
@TH_OFF@ @echo "Enter 'make installth' to install thread library" |
47 |
@@ -257,7 +256,7 @@ shlib : $(BUILD_SL) |
47 |
@@ -259,13 +258,13 @@ dmalloc.h : $(srcdir)/dmalloc.h.1 dmalloc.h.2 $(srcdir |
48 |
# via: http://256.com/gray/email.html |
|
|
49 |
$(LIB_SL) : $(LIBRARY) |
50 |
rm -f $@ $@.t |
51 |
- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) |
52 |
+ @shlinkargs@ $(LIBRARY) |
53 |
mv $@.t $@ |
54 |
|
48 |
|
55 |
$(LIBRARY) : $(OBJS) $(NORMAL_OBJS) |
49 |
$(INFO_FILE) : $(srcdir)/$(TEXI_FILE) |
56 |
@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) |
|
|
57 |
|
58 |
$(LIB_TH_SL) : $(LIB_TH) |
59 |
rm -f $@ $@.t |
50 |
rm -f $@ $@.t |
60 |
- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) |
51 |
- makeinfo -o $@.t --fill-column=100 --no-split $< |
61 |
+ @shlinkargs@ $(LIB_TH) |
52 |
+ makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/$(TEXI_FILE) |
62 |
mv $@.t $@ |
53 |
mv $@.t $@ |
63 |
|
54 |
|
64 |
$(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) |
55 |
# we need the FILE2 this because make gets confused by ../dmalloc.html |
65 |
@@ -279,7 +278,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) |
56 |
$(HTML_FILE) $(HTML_FILE2) : $(srcdir)/$(TEXI_FILE) |
66 |
|
|
|
67 |
$(LIB_CXX_SL) : $(LIB_CXX) |
68 |
rm -f $@ $@.t |
57 |
rm -f $@ $@.t |
69 |
- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) |
58 |
- texi2html --output=$@.t -number -monolithic $< |
70 |
+ @shlinkargs@ $(LIB_CXX) |
59 |
+ texi2html --output=$@.t $(srcdir)/$(TEXI_FILE) |
71 |
mv $@.t $@ |
60 |
mv $@.t $@ |
72 |
|
61 |
|
73 |
$(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) |
62 |
# we need the FILE2 this because make gets confused by ../INSTALL.txt |
74 |
@@ -288,7 +287,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) |
63 |
@@ -353,8 +352,7 @@ utils : $(UTIL) |
75 |
|
64 |
|
76 |
$(LIB_TH_CXX_SL) : $(LIB_TH_CXX) |
65 |
$(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o |
77 |
rm -f $@ $@.t |
|
|
78 |
- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) |
79 |
+ @shlinkargs@ $(LIB_TH_CXX) |
80 |
mv $@.t $@ |
81 |
|
82 |
threadssl : $(LIB_TH_SL) |
83 |
@@ -311,9 +310,8 @@ utils : $(UTIL) |
84 |
|
85 |
$(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o |
86 |
rm -f $@ |
66 |
rm -f $@ |
87 |
- $(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o \ |
67 |
- $(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS) |
88 |
+ $(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o \ |
|
|
89 |
$(LIBS) |
90 |
- mv $(A_OUT) $@ |
68 |
- mv $(A_OUT) $@ |
|
|
69 |
+ $(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS) |
91 |
|
70 |
|
92 |
# special _th versions of objects with the LOCK_THREADS variable defined to 1 |
71 |
# special _th versions of objects with the LOCK_THREADS variable defined to 1 |
93 |
chunk_th.o : $(srcdir)/chunk.c |
72 |
chunk_th.o : $(srcdir)/chunk.c |
94 |
@@ -335,13 +333,11 @@ tests : $(TEST) $(TEST_FC) |
73 |
@@ -373,13 +371,11 @@ tests : $(TEST) $(TEST_FC) |
95 |
|
74 |
|
96 |
$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY) |
75 |
$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY) |
97 |
rm -f $@ |
76 |
rm -f $@ |
Lines 105-109
Link Here
|
105 |
- mv $(A_OUT) $@ |
84 |
- mv $(A_OUT) $@ |
106 |
+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY) |
85 |
+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY) |
107 |
|
86 |
|
108 |
check light : $(TEST) $(TEST_FC) |
87 |
check : $(TEST) $(TEST_FC) |
109 |
./$(TEST_FC) -s |
88 |
./$(TEST_FC) -s |