Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 778584 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/Makefile.am (-29 / +58 lines)
Lines 4-11 Link Here
4
# (libtool version of the static lib, in order to access LTLIBOBJS)
4
# (libtool version of the static lib, in order to access LTLIBOBJS)
5
#FIXME: SERLIBS is only useful for LDADD_DRIVERS_SERIAL not for LDADD_COMMON
5
#FIXME: SERLIBS is only useful for LDADD_DRIVERS_SERIAL not for LDADD_COMMON
6
LDADD_COMMON = ../common/libcommon.la ../common/libparseconf.la
6
LDADD_COMMON = ../common/libcommon.la ../common/libparseconf.la
7
LDADD_DRIVERS = $(LDADD_COMMON) main.o dstate.o
7
LDADD_DRIVERS = $(LDADD_COMMON) libdummy.la
8
LDADD_DRIVERS_SERIAL = $(LDADD_DRIVERS) $(SERLIBS) serial.o
8
LDADD_DRIVERS_SERIAL = $(LDADD_DRIVERS) $(SERLIBS) libdummy_serial.la
9
9
10
# most targets are drivers, so make this the default
10
# most targets are drivers, so make this the default
11
LDADD = $(LDADD_DRIVERS_SERIAL)
11
LDADD = $(LDADD_DRIVERS_SERIAL)
Lines 102-158 upsdrvctl_LDADD = $(LDADD_COMMON) Link Here
102
102
103
# serial drivers: all of them use standard LDADD and CFLAGS
103
# serial drivers: all of them use standard LDADD and CFLAGS
104
al175_SOURCES = al175.c
104
al175_SOURCES = al175.c
105
al175_LDADD = $(LDADD) $(LDADD_COMMON)
105
apcsmart_SOURCES = apcsmart.c apcsmart_tabs.c
106
apcsmart_SOURCES = apcsmart.c apcsmart_tabs.c
107
apcsmart_LDADD = $(LDADD) $(LDADD_COMMON)
106
apcsmart_old_SOURCES = apcsmart-old.c
108
apcsmart_old_SOURCES = apcsmart-old.c
109
apcsmart_old_LDADD = $(LDADD) $(LDADD_COMMON)
107
bcmxcp_SOURCES = bcmxcp.c bcmxcp_ser.c
110
bcmxcp_SOURCES = bcmxcp.c bcmxcp_ser.c
108
bcmxcp_LDADD = $(LDADD) -lm
111
bcmxcp_LDADD = $(LDADD) $(LDADD_COMMON) -lm
109
belkin_SOURCES = belkin.c
112
belkin_SOURCES = belkin.c
113
belkin_LDADD = $(LDADD) $(LDADD_COMMON)
110
belkinunv_SOURCES = belkinunv.c
114
belkinunv_SOURCES = belkinunv.c
115
belkinunv_LDADD = $(LDADD) $(LDADD_COMMON)
111
bestfcom_SOURCES = bestfcom.c
116
bestfcom_SOURCES = bestfcom.c
117
bestfcom_LDADD = $(LDADD) $(LDADD_COMMON)
118
bestfortress_SOURCES= bestfortress.c
119
bestfortress_LDADD = $(LDADD) $(LDADD_COMMON)
112
bestuferrups_SOURCES = bestuferrups.c
120
bestuferrups_SOURCES = bestuferrups.c
121
bestuferrups_LDADD = $(LDADD) $(LDADD_COMMON)
113
bestups_SOURCES = bestups.c
122
bestups_SOURCES = bestups.c
123
bestups_LDADD = $(LDADD) $(LDADD_COMMON)
114
blazer_ser_SOURCES = blazer.c blazer_ser.c
124
blazer_ser_SOURCES = blazer.c blazer_ser.c
115
blazer_ser_LDADD = $(LDADD) -lm
125
blazer_ser_LDADD = $(LDADD) $(LDADD_COMMON) -lm
116
etapro_SOURCES = etapro.c
126
etapro_SOURCES = etapro.c
127
etapro_LDADD = $(LDADD) $(LDADD_COMMON)
117
everups_SOURCES = everups.c
128
everups_SOURCES = everups.c
129
everups_LDADD = $(LDADD) $(LDADD_COMMON)
118
gamatronic_SOURCES = gamatronic.c
130
gamatronic_SOURCES = gamatronic.c
131
gamatronic_LDADD = $(LDADD) $(LDADD_COMMON)
119
genericups_SOURCES = genericups.c
132
genericups_SOURCES = genericups.c
133
genericups_LDADD = $(LDADD) $(LDADD_COMMON)
120
isbmex_SOURCES = isbmex.c
134
isbmex_SOURCES = isbmex.c
121
isbmex_LDADD = $(LDADD) -lm
135
isbmex_LDADD = $(LDADD) $(LDADD_COMMON) -lm
122
ivtscd_SOURCES = ivtscd.c
136
ivtscd_SOURCES = ivtscd.c
137
ivtscd_LDADD = $(LDADD) $(LDADD_COMMON)
123
liebert_SOURCES = liebert.c
138
liebert_SOURCES = liebert.c
139
liebert_LDADD = $(LDADD) $(LDADD_COMMON)
124
liebert_esp2_SOURCES = liebert-esp2.c
140
liebert_esp2_SOURCES = liebert-esp2.c
141
liebert_esp2_LDADD = $(LDADD) $(LDADD_COMMON)
125
masterguard_SOURCES = masterguard.c
142
masterguard_SOURCES = masterguard.c
143
masterguard_LDADD = $(LDADD) $(LDADD_COMMON)
126
metasys_SOURCES = metasys.c
144
metasys_SOURCES = metasys.c
145
metasys_LDADD = $(LDADD) $(LDADD_COMMON)
127
mge_utalk_SOURCES = mge-utalk.c
146
mge_utalk_SOURCES = mge-utalk.c
147
mge_utalk_LDADD = $(LDADD) $(LDADD_COMMON)
128
microdowell_SOURCES = microdowell.c
148
microdowell_SOURCES = microdowell.c
149
microdowell_LDADD = $(LDADD) $(LDADD_COMMON)
129
oneac_SOURCES = oneac.c
150
oneac_SOURCES = oneac.c
151
oneac_LDADD = $(LDADD) $(LDADD_COMMON)
130
optiups_SOURCES = optiups.c
152
optiups_SOURCES = optiups.c
153
optiups_LDADD = $(LDADD) $(LDADD_COMMON)
154
optiup_LDADD = $(LDADD) $(LDADD_COMMON)
131
powercom_SOURCES = powercom.c
155
powercom_SOURCES = powercom.c
132
powercom_LDADD = $(LDADD) -lm
156
powercom_LDADD = $(LDADD) $(LDADD_COMMON) -lm
133
powerpanel_SOURCES = powerpanel.c powerp-bin.c powerp-txt.c
157
powerpanel_SOURCES = powerpanel.c powerp-bin.c powerp-txt.c
134
powerpanel_LDADD = $(LDADD) -lm
158
powerpanel_LDADD = $(LDADD) $(LDADD_COMMON) -lm
135
rhino_SOURCES = rhino.c
159
rhino_SOURCES = rhino.c
136
rhino_LDADD = $(LDADD) -lm
160
rhino_LDADD = $(LDADD) $(LDADD_COMMON) -lm
137
safenet_SOURCES = safenet.c
161
safenet_SOURCES = safenet.c
162
safenet_LDADD = $(LDADD) $(LDADD_COMMON)
138
nutdrv_siemens_sitop_SOURCES = nutdrv_siemens_sitop.c
163
nutdrv_siemens_sitop_SOURCES = nutdrv_siemens_sitop.c
164
nutdrv_siemens_sitop_LDADD = $(LDADD) $(LDADD_COMMON)
139
solis_SOURCES = solis.c
165
solis_SOURCES = solis.c
140
solis_LDADD = $(LDADD) -lm
166
solis_LDADD = $(LDADD) $(LDADD_COMMON) -lm
141
tripplite_SOURCES = tripplite.c
167
tripplite_SOURCES = tripplite.c
142
tripplite_LDADD = $(LDADD) -lm
168
tripplite_LDADD = $(LDADD) $(LDADD_COMMON) -lm
143
tripplitesu_SOURCES = tripplitesu.c
169
tripplitesu_SOURCES = tripplitesu.c
170
tripplitesu_LDADD = $(LDADD) $(LDADD_COMMON)
144
upscode2_SOURCES = upscode2.c
171
upscode2_SOURCES = upscode2.c
145
upscode2_LDADD = $(LDADD) -lm
172
upscode2_LDADD = $(LDADD) $(LDADD_COMMON) -lm
146
victronups_SOURCES = victronups.c
173
victronups_SOURCES = victronups.c
174
victronups_LDADD = $(LDADD) $(LDADD_COMMON)
147
riello_ser_SOURCES = riello.c riello_ser.c
175
riello_ser_SOURCES = riello.c riello_ser.c
148
riello_ser_LDADD = $(LDADD) -lm
176
riello_ser_LDADD = $(LDADD) $(LDADD_COMMON) -lm
149
177
150
# non-serial drivers: these use custom LDADD and/or CFLAGS
178
# non-serial drivers: these use custom LDADD and/or CFLAGS
151
179
152
# dummy
180
# dummy
153
dummy_ups_SOURCES = dummy-ups.c
181
dummy_ups_SOURCES = dummy-ups.c
154
dummy_ups_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/clients
182
dummy_ups_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/clients
155
dummy_ups_LDADD = $(LDADD_DRIVERS) ../clients/libupsclient.la
183
dummy_ups_LDADD = $(LDADD_DRIVERS) ../clients/libupsclient.la ../common/libcommon.la
156
if WITH_SSL
184
if WITH_SSL
157
  dummy_ups_CFLAGS += $(LIBSSL_CFLAGS)
185
  dummy_ups_CFLAGS += $(LIBSSL_CFLAGS)
158
  dummy_ups_LDADD += $(LIBSSL_LIBS)
186
  dummy_ups_LDADD += $(LIBSSL_LIBS)
Lines 160-176 endif Link Here
160
188
161
# Clone drivers
189
# Clone drivers
162
clone_SOURCES = clone.c
190
clone_SOURCES = clone.c
191
clone_LDADD = $(LDADD) $(LDADD_COMMON)
163
clone_outlet_SOURCES = clone-outlet.c
192
clone_outlet_SOURCES = clone-outlet.c
193
clone_outlet_LDADD = $(LDADD) $(LDADD_COMMON)
164
194
165
# apcupsd client driver
195
# apcupsd client driver
166
apcupsd_ups_SOURCES = apcupsd-ups.c
196
apcupsd_ups_SOURCES = apcupsd-ups.c
167
apcupsd_ups_CFLAGS = $(AM_CFLAGS)
197
apcupsd_ups_CFLAGS = $(AM_CFLAGS)
168
apcupsd_ups_LDADD = $(LDADD_DRIVERS)
198
apcupsd_ups_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON)
169
199
170
# sample skeleton driver
200
# sample skeleton driver
171
201
172
skel_SOURCES = skel.c
202
skel_SOURCES = skel.c
173
skel_LDADD = $(LDADD_DRIVERS)
203
skel_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON)
174
204
175
# USB
205
# USB
176
USBHID_UPS_SUBDRIVERS = apc-hid.c belkin-hid.c cps-hid.c explore-hid.c \
206
USBHID_UPS_SUBDRIVERS = apc-hid.c belkin-hid.c cps-hid.c explore-hid.c \
Lines 178-209 USBHID_UPS_SUBDRIVERS = apc-hid.c belkin-hid.c cps-hid.c explore-hid.c \ Link Here
178
 openups-hid.c powervar-hid.c
208
 openups-hid.c powervar-hid.c
179
usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c	\
209
usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c	\
180
 usb-common.c $(USBHID_UPS_SUBDRIVERS)
210
 usb-common.c $(USBHID_UPS_SUBDRIVERS)
181
usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
211
usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS) -lm
182
212
183
tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c
213
tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c
184
tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
214
tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS) -lm
185
215
186
bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c
216
bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c
187
bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
217
bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS) -lm
188
218
189
blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c
219
blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c
190
blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
220
blazer_usb_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS) -lm
191
221
192
nutdrv_atcl_usb_SOURCES = nutdrv_atcl_usb.c usb-common.c
222
nutdrv_atcl_usb_SOURCES = nutdrv_atcl_usb.c usb-common.c
193
nutdrv_atcl_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
223
nutdrv_atcl_usb_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS)
194
224
195
richcomm_usb_SOURCES = richcomm_usb.c usb-common.c
225
richcomm_usb_SOURCES = richcomm_usb.c usb-common.c
196
richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
226
richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS)
197
227
198
riello_usb_SOURCES = riello.c riello_usb.c libusb.c usb-common.c
228
riello_usb_SOURCES = riello.c riello_usb.c libusb.c usb-common.c
199
riello_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
229
riello_usb_LDADD = $(LDADD_DRIVERS) $(LDADD_COMMON) $(LIBUSB_LIBS) -lm
200
201
230
202
# HID-over-serial
231
# HID-over-serial
203
mge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c
232
mge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c
204
# per-target CFLAGS are necessary here
233
# per-target CFLAGS are necessary here
205
mge_shut_CFLAGS = $(AM_CFLAGS) -DSHUT_MODE
234
mge_shut_CFLAGS = $(AM_CFLAGS) -DSHUT_MODE
206
mge_shut_LDADD = $(LDADD) -lm
235
mge_shut_LDADD = $(LDADD) $(LDADD_COMMON) -lm
207
236
208
# SNMP
237
# SNMP
209
snmp_ups_SOURCES = snmp-ups.c apc-mib.c baytech-mib.c compaq-mib.c \
238
snmp_ups_SOURCES = snmp-ups.c apc-mib.c baytech-mib.c compaq-mib.c \
Lines 249-259 pijuice_SOURCES = pijuice.c Link Here
249
278
250
# nutdrv_qx USB/Serial
279
# nutdrv_qx USB/Serial
251
nutdrv_qx_SOURCES = nutdrv_qx.c
280
nutdrv_qx_SOURCES = nutdrv_qx.c
252
nutdrv_qx_LDADD = $(LDADD_DRIVERS) -lm
281
nutdrv_qx_LDADD = $(LDADD_DRIVERS) ../common/libcommon.la -lm
253
nutdrv_qx_CFLAGS = $(AM_CFLAGS)
282
nutdrv_qx_CFLAGS = $(AM_CFLAGS)
254
if WITH_SERIAL
283
if WITH_SERIAL
255
nutdrv_qx_CFLAGS += -DQX_SERIAL
284
nutdrv_qx_CFLAGS += -DQX_SERIAL
256
nutdrv_qx_LDADD += $(SERLIBS) serial.o
285
nutdrv_qx_LDADD += $(SERLIBS) libdummy_serial.la
257
endif
286
endif
258
if WITH_USB
287
if WITH_USB
259
nutdrv_qx_CFLAGS += -DQX_USB
288
nutdrv_qx_CFLAGS += -DQX_USB
Lines 291-295 dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h bcmxcp_ser.h \ Link Here
291
320
292
# Define a dummy library so that Automake builds rules for the
321
# Define a dummy library so that Automake builds rules for the
293
# corresponding object files.  This library is not actually built,
322
# corresponding object files.  This library is not actually built,
294
EXTRA_LIBRARIES = libdummy.a
323
EXTRA_LTLIBRARIES = libdummy.la libdummy_serial.la
295
libdummy_a_SOURCES = main.c dstate.c serial.c
324
libdummy_la_SOURCES = main.c dstate.c
325
libdummy_serial_la_SOURCES = serial.c
296
- 

Return to bug 778584