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

Collapse All | Expand All

(-)a/Makefile.am (-10 / +2 lines)
Lines 199-218 libsigrok_la_SOURCES += \ Link Here
199
noinst_LTLIBRARIES = src/libdrivers.la \
199
noinst_LTLIBRARIES = src/libdrivers.la \
200
	src/libdrivers_head.la src/libdrivers_tail.la
200
	src/libdrivers_head.la src/libdrivers_tail.la
201
201
202
src/libdrivers.o: src/libdrivers.la \
203
		src/libdrivers_head.la src/libdrivers_tail.la
204
	$(AM_V_CCLD)$(LINK) src/libdrivers_head.la src/libdrivers.la \
205
		src/libdrivers_tail.la
206
src/libdrivers.lo: src/libdrivers.o
207
	$(AM_V_GEN)echo "# Generated by libtool" > $@
208
	$(AM_V_at)echo "pic_object='libdrivers.o'" >> $@
209
	$(AM_V_at)echo "non_pic_object='libdrivers.o'" >> $@
210
211
src_libdrivers_head_la_SOURCES = src/driver_list_start.c
202
src_libdrivers_head_la_SOURCES = src/driver_list_start.c
212
203
213
src_libdrivers_tail_la_SOURCES = src/driver_list_stop.c
204
src_libdrivers_tail_la_SOURCES = src/driver_list_stop.c
214
205
215
src_libdrivers_la_SOURCES = src/drivers.c
206
src_libdrivers_la_SOURCES = src/drivers.c
207
src_libdrivers_la_LIBADD = src/libdrivers_head.la src/libdrivers_tail.la
216
208
217
if HW_AGILENT_DMM
209
if HW_AGILENT_DMM
218
src_libdrivers_la_SOURCES += \
210
src_libdrivers_la_SOURCES += \
Lines 675-681 src_libdrivers_la_SOURCES += \ Link Here
675
	src/hardware/zketech-ebd-usb/api.c
667
	src/hardware/zketech-ebd-usb/api.c
676
endif
668
endif
677
669
678
libsigrok_la_LIBADD = src/libdrivers.lo $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
670
libsigrok_la_LIBADD = src/libdrivers.la $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
679
libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
671
libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
680
672
681
library_includedir = $(includedir)/libsigrok
673
library_includedir = $(includedir)/libsigrok

Return to bug 780840