]>
Commit | Line | Data |
---|---|---|
3bb421f0 JR |
1 | --- brltty-5.4/Programs/Makefile.in~ 2016-06-24 05:41:56.000000000 +0200 |
2 | +++ brltty-5.4/Programs/Makefile.in 2017-03-12 15:13:12.796662034 +0100 | |
3 | @@ -458,7 +458,7 @@ | |
4 | BRLTTY_TTB_OBJECTS = brltty-ttb.$O $(PROGRAM_OBJECTS) dataarea.$O $(TTB_OBJECTS) ttb_gnome.$O ttb_louis.$O | |
5 | ||
6 | brltty-ttb$X: $(BRLTTY_TTB_OBJECTS) $(BUILD_API) | |
7 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TTB_OBJECTS) $(API_REF) $(CURSES_LIBS) $(LDLIBS) | |
8 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TTB_OBJECTS) $(API_REF) $(CURSES_LIBS) $(LDLIBS) $(SERVICE_LIBS) | |
9 | ||
10 | brltty-ttb.$O: | |
11 | $(CC) $(CFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/brltty-ttb.c | |
12 | @@ -484,7 +484,7 @@ | |
13 | BRLTTY_ATB_OBJECTS = brltty-atb.$O $(PROGRAM_OBJECTS) $(ATB_OBJECTS) dataarea.$O | |
14 | ||
15 | brltty-atb$X: $(BRLTTY_ATB_OBJECTS) | |
16 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_ATB_OBJECTS) $(LDLIBS) | |
17 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_ATB_OBJECTS) $(LDLIBS) $(SERVICE_LIBS) | |
18 | ||
19 | brltty-atb.$O: | |
20 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-atb.c | |
21 | @@ -507,7 +507,7 @@ | |
22 | BRLTTY_CTB_OBJECTS = brltty-ctb.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) dataarea.$O $(TTB_OBJECTS) ctb_compile.$O ctb_translate.$O | |
23 | ||
24 | brltty-ctb$X: $(BRLTTY_CTB_OBJECTS) | |
25 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS) | |
26 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS) $(SERVICE_LIBS) | |
27 | ||
28 | brltty-ctb.$O: | |
29 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ctb.c | |
30 | @@ -545,7 +545,7 @@ | |
31 | BRLTTY_KTB_OBJECTS = brltty-ktb.$O $(PROGRAM_OBJECTS) $(KTB_OBJECTS) ktb_audit.$O ktb_keyboard.$O $(TTB_OBJECTS) dataarea.$O drivers.$O driver.$O brl_utils.$O brl_driver.$O brl_base.$O $(BRAILLE_DRIVER_OBJECTS) $(IO_OBJECTS) $(PREFS_OBJECTS) cmd.$O cmd_queue.$O hidkeys.$O report.$O cmd_brlapi.$O | |
32 | ||
33 | brltty-ktb$X: $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVERS) | |
34 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) | |
35 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) $(SERVICE_LIBS) | |
36 | ||
37 | brltty-ktb.$O: | |
38 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ktb.c | |
39 | @@ -740,7 +740,7 @@ | |
40 | BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) | |
41 | ||
42 | brltty$X: $(BRLTTY_OBJECTS) | |
43 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) | |
44 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) $(SERVICE_LIBS) | |
45 | ||
46 | brltty.$O: | |
47 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty.c | |
48 | @@ -778,7 +778,7 @@ | |
49 | BRLTTY_TRTXT_OBJECTS = brltty-trtxt.$O $(PROGRAM_OBJECTS) $(TTB_OBJECTS) dataarea.$O | |
50 | ||
51 | brltty-trtxt$X: $(BRLTTY_TRTXT_OBJECTS) | |
52 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TRTXT_OBJECTS) $(LDLIBS) | |
53 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TRTXT_OBJECTS) $(LDLIBS) $(SERVICE_LIBS) | |
54 | ||
55 | brltty-trtxt.$O: | |
56 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-trtxt.c | |
57 | @@ -788,7 +788,7 @@ | |
58 | BRLTEST_OBJECTS = brltest.$O $(PROGRAM_OBJECTS) report.$O $(TTB_OBJECTS) $(KTB_OBJECTS) dataarea.$O cmd.$O cmd_queue.$O drivers.$O driver.$O $(BRAILLE_OBJECTS) $(PREFS_OBJECTS) hidkeys.$O learn.$O | |
59 | ||
60 | brltest$X: $(BRLTEST_OBJECTS) | |
61 | - $(CC) $(LDFLAGS) -o $@ $(BRLTEST_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) | |
62 | + $(CC) $(LDFLAGS) -o $@ $(BRLTEST_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) $(SERVICE_LIBS) | |
63 | ||
64 | brltest.$O: | |
65 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltest.c | |
66 | @@ -798,7 +798,7 @@ | |
67 | SPKTEST_OBJECTS = spktest.$O $(PROGRAM_OBJECTS) drivers.$O driver.$O $(SPEECH_OBJECTS) $(PREFS_OBJECTS) | |
68 | ||
69 | spktest$X: $(SPKTEST_OBJECTS) | |
70 | - $(CC) $(LDFLAGS) -o $@ $(SPKTEST_OBJECTS) $(SPEECH_DRIVER_LIBRARIES) $(LDLIBS) | |
71 | + $(CC) $(LDFLAGS) -o $@ $(SPKTEST_OBJECTS) $(SPEECH_DRIVER_LIBRARIES) $(LDLIBS) $(SERVICE_LIBS) | |
72 | ||
73 | spktest.$O: | |
74 | $(CC) $(CFLAGS) -c $(SRC_DIR)/spktest.c | |
75 | @@ -808,7 +808,7 @@ | |
76 | SCRTEST_OBJECTS = scrtest.$O $(PROGRAM_OBJECTS) drivers.$O driver.$O $(SCREEN_OBJECTS) report.$O | |
77 | ||
78 | scrtest$X: $(SCRTEST_OBJECTS) | |
79 | - $(CC) $(LDFLAGS) -o $@ $(SCRTEST_OBJECTS) $(SCREEN_DRIVER_LIBRARIES) $(LDLIBS) | |
80 | + $(CC) $(LDFLAGS) -o $@ $(SCRTEST_OBJECTS) $(SCREEN_DRIVER_LIBRARIES) $(LDLIBS) $(SERVICE_LIBS) | |
81 | ||
82 | scrtest.$O: | |
83 | $(CC) $(CFLAGS) -c $(SRC_DIR)/scrtest.c | |
84 | @@ -818,7 +818,7 @@ | |
85 | BRLTTY_TUNE_OBJECTS = brltty-tune.$O tune_utils.$O tune_build.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) $(TUNE_OBJECTS) io_misc.$O | |
86 | ||
87 | brltty-tune$X: $(BRLTTY_TUNE_OBJECTS) | |
88 | - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TUNE_OBJECTS) $(PCM_LIBS) $(MIDI_LIBS) $(LDLIBS) | |
89 | + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TUNE_OBJECTS) $(PCM_LIBS) $(MIDI_LIBS) $(LDLIBS) $(SERVICE_LIBS) | |
90 | ||
91 | brltty-tune.$O: | |
92 | $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-tune.c | |
93 | @@ -834,7 +834,7 @@ | |
94 | APITEST_OBJECTS = apitest.$O $(PROGRAM_OBJECTS) cmd.$O cmd_brlapi.$O $(TTB_OBJECTS) dataarea.$O | |
95 | ||
96 | apitest$X: $(APITEST_OBJECTS) api | |
97 | - $(CC) $(LDFLAGS) -o $@ $(APITEST_OBJECTS) $(API_LIBS) $(LDLIBS) | |
98 | + $(CC) $(LDFLAGS) -o $@ $(APITEST_OBJECTS) $(API_LIBS) $(LDLIBS) $(SERVICE_LIBS) | |
99 | ||
100 | apitest.$O: | |
101 | $(CC) $(CFLAGS) -c $(SRC_DIR)/apitest.c | |
102 | @@ -887,7 +887,7 @@ | |
103 | XBRLAPI_OBJECTS = xbrlapi.$O $(PROGRAM_OBJECTS) | |
104 | ||
105 | xbrlapi$X: $(XBRLAPI_OBJECTS) api | |
b25dee4e JR |
106 | - $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS) |
107 | + $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS) $(SERVICE_LIBS) | |
3bb421f0 JR |
108 | |
109 | xbrlapi.$O: | |
110 | $(CC) $(CFLAGS) $(XSV_INCLUDES) -c $(SRC_DIR)/xbrlapi.c | |
111 | @@ -898,7 +898,7 @@ | |
112 | TBL2HEX_OBJECTS = $(TBL2HEX_OBJECTS_FOR_BUILD:.$(O_FOR_BUILD)=.$B) | |
113 | ||
114 | tbl2hex$(X_FOR_BUILD): $(TBL2HEX_OBJECTS) | |
115 | - $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(LDLIBS_FOR_BUILD) | |
116 | + $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(LDLIBS_FOR_BUILD) $(SERVICE_LIBS) | |
117 | ||
118 | ############################################################################### | |
119 |