]>
Commit | Line | Data |
---|---|---|
cfab6e6b JB |
1 | --- BitchX/dll/aim/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 |
2 | +++ BitchX/dll/aim/Makefile.in 2004-06-18 12:50:40.000000000 +0200 | |
3 | @@ -160,7 +160,7 @@ | |
4 | ||
5 | PLUGIN_NAME = aim | |
6 | ||
7 | -OBJS = toc.o util.o cmd.o aim.o $(topdir)/source/compat.o | |
8 | +OBJS = toc.o util.o cmd.o aim.o compat.o | |
9 | ||
10 | all: Makefile toc aim$(SHLIB_SUFFIX) | |
11 | ||
12 | @@ -168,21 +168,21 @@ | |
13 | cd $(topdir) \ | |
14 | && ./config.status | |
15 | ||
16 | -$(topdir)/source/compat.o: $(top_srcdir)/source/compat.c | |
17 | - $(CC) $(AIMDEFS) $(CFLAGS) \ | |
18 | - -c $(top_srcdir)/source/compat.c -o $(topdir)/source/compat.o | |
19 | +compat.o: $(top_srcdir)/source/compat.c | |
20 | + $(CC) $(AIMDEFS) $(CFLAGS) $(SHLIB_CFLAGS) \ | |
21 | + -c $(top_srcdir)/source/compat.c -o compat.o | |
22 | ||
23 | toc.o: $(srcdir)/toc.c | |
24 | - $(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/toc.c | |
25 | + $(CC) $(AIMDEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/toc.c | |
26 | ||
27 | util.o: $(srcdir)/util.c | |
28 | - $(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/util.c | |
29 | + $(CC) $(AIMDEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/util.c | |
30 | ||
31 | cmd.o: $(srcdir)/cmd.c | |
32 | - $(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/cmd.c | |
33 | + $(CC) $(AIMDEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/cmd.c | |
34 | ||
35 | aim.o: $(srcdir)/aim.c | |
36 | - $(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/aim.c | |
37 | + $(CC) $(AIMDEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/aim.c | |
38 | ||
39 | aim$(SHLIB_SUFFIX): $(OBJS) | |
40 | $(SHLIB_LD) $(OBJS) $(SHLIB_CFLAGS) -o aim$(SHLIB_SUFFIX) -Ltoc -ltoc | |
41 | --- BitchX/dll/amp/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
42 | +++ BitchX/dll/amp/Makefile.in 2004-06-18 12:51:12.000000000 +0200 | |
43 | @@ -187,7 +187,7 @@ | |
44 | OS := $(shell uname -s) | |
45 | ||
46 | .c.o: | |
47 | - $(CC) -DOS_$(OS) $(DEFS) $(CFLAGS) -c $< | |
48 | + $(CC) -DOS_$(OS) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $< | |
49 | ||
50 | depend: | |
51 | gcc -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c > .depend | |
5fa99c27 JB |
52 | --- BitchX/dll/nap/Makefile.in.orig 2005-03-27 14:55:14.559935000 +0200 |
53 | +++ BitchX/dll/nap/Makefile.in 2005-03-27 14:59:09.848626682 +0200 | |
54 | @@ -158,7 +158,7 @@ | |
55 | ||
56 | PLUGIN_NAME = nap | |
57 | ||
58 | -OBJS = nap.o napsend.o nap_file.o napfunc.o napother.o md5.o $(topdir)/source/compat.o | |
59 | +OBJS = nap.o napsend.o nap_file.o napfunc.o napother.o md5.o compat.o | |
60 | ||
61 | all: Makefile nap$(SHLIB_SUFFIX) | |
62 | ||
cfab6e6b JB |
63 | @@ -166,27 +166,27 @@ |
64 | cd $(topdir) \ | |
65 | && ./config.status | |
66 | ||
67 | -$(topdir)/source/compat.o: $(top_srcdir)/source/compat.c | |
68 | - $(CC) $(DEFS) $(CFLAGS) \ | |
69 | - -c $(top_srcdir)/source/compat.c -o $(topdir)/source/compat.o | |
70 | +compat.o: $(top_srcdir)/source/compat.c | |
71 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) \ | |
72 | + -c $(top_srcdir)/source/compat.c -o compat.o | |
73 | ||
74 | nap.o: $(srcdir)/nap.c | |
75 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/nap.c | |
76 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/nap.c | |
77 | ||
78 | napsend.o: $(srcdir)/napsend.c | |
79 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/napsend.c | |
80 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/napsend.c | |
81 | ||
82 | nap_file.o: $(srcdir)/nap_file.c | |
83 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/nap_file.c | |
84 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/nap_file.c | |
85 | ||
86 | napfunc.o: $(srcdir)/napfunc.c | |
87 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/napfunc.c | |
88 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/napfunc.c | |
89 | ||
90 | napother.o: $(srcdir)/napother.c | |
91 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/napother.c | |
92 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/napother.c | |
93 | ||
94 | md5.o: $(srcdir)/md5.c $(srcdir)/md5.h | |
95 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/md5.c | |
96 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/md5.c | |
97 | ||
98 | nap$(SHLIB_SUFFIX): $(OBJS) | |
99 | $(SHLIB_LD) $(OBJS) $(SHLIB_CFLAGS) -o nap$(SHLIB_SUFFIX) | |
100 | --- BitchX/dll/qbx/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
101 | +++ BitchX/dll/qbx/Makefile.in 2004-06-18 13:03:34.000000000 +0200 | |
102 | @@ -164,7 +164,7 @@ | |
103 | && ./config.status | |
104 | ||
105 | qbx.o: $(srcdir)/qbx.c | |
106 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/qbx.c | |
107 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/qbx.c | |
108 | ||
109 | qbx$(SHLIB_SUFFIX): qbx.o ../dllinit.o | |
110 | $(SHLIB_LD) qbx.o ../dllinit.o $(SHLIB_CFLAGS) -o qbx$(SHLIB_SUFFIX) | |
111 | --- BitchX/dll/abot/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
112 | +++ BitchX/dll/abot/Makefile.in 2004-06-18 12:48:51.000000000 +0200 | |
113 | @@ -165,7 +165,7 @@ | |
114 | && ./config.status | |
115 | ||
116 | autobot.o: $(srcdir)/autobot.c | |
117 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/autobot.c | |
118 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/autobot.c | |
119 | ||
120 | autobot$(SHLIB_SUFFIX): autobot.o ../dllinit.o | |
121 | $(SHLIB_LD) autobot.o ../dllinit.o $(SHLIB_CFLAGS) -o autobot$(SHLIB_SUFFIX) | |
122 | --- BitchX/dll/acro/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
123 | +++ BitchX/dll/acro/Makefile.in 2004-06-18 12:49:08.000000000 +0200 | |
124 | @@ -165,7 +165,7 @@ | |
125 | && ./config.status | |
126 | ||
127 | acro.o: $(srcdir)/acro.c | |
128 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/acro.c | |
129 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/acro.c | |
130 | ||
131 | acro$(SHLIB_SUFFIX): acro.o ../dllinit.o | |
132 | $(SHLIB_LD) acro.o ../dllinit.o $(SHLIB_CFLAGS) -o acro$(SHLIB_SUFFIX) | |
133 | --- BitchX/dll/hint/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
134 | +++ BitchX/dll/hint/Makefile.in 2004-06-18 12:59:34.000000000 +0200 | |
135 | @@ -165,7 +165,7 @@ | |
136 | && ./config.status | |
137 | ||
138 | hint.o: $(srcdir)/hint.c | |
139 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/hint.c | |
140 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/hint.c | |
141 | ||
142 | hint$(SHLIB_SUFFIX): hint.o ../dllinit.o | |
143 | $(SHLIB_LD) hint.o ../dllinit.o $(SHLIB_CFLAGS) -o hint$(SHLIB_SUFFIX) | |
144 | --- BitchX/dll/pkga/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
145 | +++ BitchX/dll/pkga/Makefile.in 2004-06-18 13:02:57.000000000 +0200 | |
146 | @@ -165,7 +165,7 @@ | |
147 | && ./config.status | |
148 | ||
149 | pkga.o: $(srcdir)/pkga.c | |
150 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/pkga.c | |
151 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/pkga.c | |
152 | ||
153 | pkga$(SHLIB_SUFFIX): pkga.o ../dllinit.o | |
154 | $(SHLIB_LD) pkga.o ../dllinit.o $(SHLIB_CFLAGS) -o pkga$(SHLIB_SUFFIX) | |
155 | --- BitchX/dll/scan/Makefile.in.orig 2003-04-11 03:09:06.000000000 +0200 | |
156 | +++ BitchX/dll/scan/Makefile.in 2004-06-18 13:03:57.000000000 +0200 | |
157 | @@ -165,7 +165,7 @@ | |
158 | && ./config.status | |
159 | ||
160 | scan.o: $(srcdir)/scan.c | |
161 | - $(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/scan.c | |
162 | + $(CC) $(DEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/scan.c | |
163 | ||
164 | scan$(SHLIB_SUFFIX): scan.o ../dllinit.o | |
165 | $(SHLIB_LD) scan.o ../dllinit.o $(SHLIB_CFLAGS) -o scan$(SHLIB_SUFFIX) | |
166 | @@ -177,4 +177,4 @@ | |
167 | $(RM) Makefile | |
168 | ||
169 | install: | |
170 | - $(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR) | |
171 |