Attachment #241833 for bug #331085

Lines 72-80 Link Here

(-)plugins/audio/G722/Makefile.in~ (-2 / +2 lines)
72	$(PLUGIN): $(OBJECTS)	72	$(PLUGIN): $(OBJECTS)
73	ifeq (solaris,$(findstring solaris,$(target_os)))	73	ifeq (solaris,$(findstring solaris,$(target_os)))
74		74
75	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	75	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
76	else	76	else
77	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	77	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
78		78
79	endif	79	endif
80		80

Lines 101-109 Link Here

(-)plugins/audio/G726/Makefile.in~ (-2 / +2 lines)
101		101
102	ifeq (solaris,$(findstring solaris,$(target_os)))	102	ifeq (solaris,$(findstring solaris,$(target_os)))
103		103
104	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	104	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
105	else	105	else
106	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	106	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
107		107
108	endif	108	endif
109		109

Lines 161-169 Link Here

(-)plugins/audio/GSM0610/Makefile.in~ (-2 / +2 lines)
161		161
162	ifeq (solaris,$(findstring solaris,$(target_os)))	162	ifeq (solaris,$(findstring solaris,$(target_os)))
163		163
164	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	164	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
165	else	165	else
166	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	166	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
167		167
168	endif	168	endif
169		169

Lines 167-175 Link Here

(-)plugins/audio/Speex/Makefile.in~ (-2 / +2 lines)
167	$(PLUGIN): $(OBJECTS)	167	$(PLUGIN): $(OBJECTS)
168	ifeq (solaris,$(findstring solaris,$(target_os)))	168	ifeq (solaris,$(findstring solaris,$(target_os)))
169		169
170	$(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	170	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
171	else	171	else
172	$(Q_LD)$(CXX) $(LDSO) -o $@ $^ $(EXTRALIBS)	172	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
173		173
174	endif	174	endif
175		175

Lines 60-68 Link Here

(-)plugins/audio/gsm-amr/Makefile.in~ (-2 / +2 lines)
60		60
61	ifeq (solaris,$(findstring solaris,$(target_os)))	61	ifeq (solaris,$(findstring solaris,$(target_os)))
62		62
63	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^	63	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^
64	else	64	else
65	$(Q_LD)$(CC) $(LDSO) -o $@ $^	65	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^
66		66
67	endif	67	endif
68		68

Lines 91-99 Link Here

(-)plugins/audio/IMA_ADPCM/Makefile.in~ (-2 / +2 lines)
91		91
92	ifeq (solaris,$(findstring solaris,$(target_os)))	92	ifeq (solaris,$(findstring solaris,$(target_os)))
93		93
94	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	94	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
95	else	95	else
96	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	96	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
97		97
98	endif	98	endif
99		99

Lines 129-137 Link Here

(-)plugins/audio/LPC_10/Makefile.in~ (-2 / +2 lines)
129		129
130	ifeq (solaris,$(findstring solaris,$(target_os)))	130	ifeq (solaris,$(findstring solaris,$(target_os)))
131		131
132	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	132	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
133	else	133	else
134	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	134	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
135		135
136	endif	136	endif
137		137

Lines 119-127 Link Here

(-)plugins/audio/iLBC/Makefile.in~ (-2 / +2 lines)
119		119
120	$(PLUGIN): $(OBJECTS)	120	$(PLUGIN): $(OBJECTS)
121	ifeq (solaris,$(findstring solaris,$(target_os)))	121	ifeq (solaris,$(findstring solaris,$(target_os)))
122	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	122	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
123	else	123	else
124	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	124	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
125	endif	125	endif
126		126
127	install:	127	install:

Lines 101-109 Link Here

(-)plugins/video/MPEG4-ffmpeg/Makefile.in~ (-2 / +2 lines)
101		101
102	$(PLUGIN): $(OBJECTS)	102	$(PLUGIN): $(OBJECTS)
103	ifeq (,$(findstring solaris,$(target_os)))	103	ifeq (,$(findstring solaris,$(target_os)))
104	$(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^	104	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $(DL_LIBS) -o $@ $^
105	else	105	else
106	$(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) $@ -o $@ $^	106	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $(DL_LIBS) $@ -o $@ $^
107	endif	107	endif
108	install:	108	install:

Lines 116-124 Link Here

(-)plugins/video/H.261-vic/Makefile.in~ (-2 / +2 lines)
116		116
117	$(PLUGIN): $(OBJECTS)	117	$(PLUGIN): $(OBJECTS)
118	ifeq (,$(findstring solaris,$(target_os)))	118	ifeq (,$(findstring solaris,$(target_os)))
119	$(Q_LD)$(CXX) $(LDSO) -o $@ $^	119	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -o $@ $^
120	else	120	else
121	$(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^	121	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $@ -o $@ $^
122	endif	122	endif
123		123
124	install:	124	install:

Lines 78-84 Link Here

(-)./plugins/audio/SBC/Makefile.in~ (-1 / +1 lines)
78	OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS)))))	78	OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS)))))
79		79
80	$(PLUGIN): $(OBJECTS)	80	$(PLUGIN): $(OBJECTS)
81	$(Q_LD)$(CXX) $(LDSO) -o $@ $^ $(EXTRALIBS)	81	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
82		82
83	$(SRCDIR)/g711a1_plc.cxx: ../../../src/codec/g711a1_plc.cxx	83	$(SRCDIR)/g711a1_plc.cxx: ../../../src/codec/g711a1_plc.cxx
84	@ln -s ../../../src/codec/g711a1_plc.cxx $(SRCDIR)/g711a1_plc.cxx	84	@ln -s ../../../src/codec/g711a1_plc.cxx $(SRCDIR)/g711a1_plc.cxx

Lines 48-56 Link Here

(-)./plugins/audio/celt/Makefile.in~ (-2 / +2 lines)
48		48
49	ifeq (solaris,$(findstring solaris,$(target_os)))	49	ifeq (solaris,$(findstring solaris,$(target_os)))
50		50
51	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(LIBS)	51	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(LIBS)
52	else	52	else
53	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(LIBS)	53	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(LIBS)
54		54
55	endif	55	endif
56		56

Lines 79-87 Link Here

(-)./plugins/LID/VPB/Makefile.in~ (-2 / +2 lines)
79		79
80	ifeq (solaris,$(findstring solaris,$(target_os)))	80	ifeq (solaris,$(findstring solaris,$(target_os)))
81		81
82	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)	82	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
83	else	83	else
84	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)	84	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
85		85
86	endif	86	endif
87		87

Lines 72-78 Link Here

(-)./plugins/LID/IxJ/Makefile.in~ (-1 / +1 lines)
72	OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))	72	OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
73		73
74	$(PLUGIN): $(OBJECTS)	74	$(PLUGIN): $(OBJECTS)
75	$(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)	75	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
76		76
77	install:	77	install:
78	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)	78	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)

Lines 43-48 Link Here

(-)plugins/LID/IxJ/Makefile.in~ (+1 lines)
43	CC=@CC@	43	CC=@CC@
44	CXX=@CXX@	44	CXX=@CXX@
45	LDSO=@LDSO@	45	LDSO=@LDSO@
		46	LDFLAGS=@LDFLAGS@
46		47
47	ifndef PREFIX	48	ifndef PREFIX
48	PREFIX=/usr/local	49	PREFIX=/usr/local

Lines 38-43 Link Here

(-)plugins/LID/CAPI/Makefile.in~ (-1 / +2 lines)
38	CC=@CC@	38	CC=@CC@
39	CXX=@CXX@	39	CXX=@CXX@
40	LDSO=@LDSO@	40	LDSO=@LDSO@
		41	LDFLAGS=@LDFLAGS@
41		42
42	ifndef PREFIX	43	ifndef PREFIX
43	PREFIX=/usr/local	44	PREFIX=/usr/local
Lines 67-73 Link Here
67	OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))	68	OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
68		69
69	$(PLUGIN): $(OBJECTS)	70	$(PLUGIN): $(OBJECTS)
70	$(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)	71	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
71		72
72	install:	73	install:
73	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)	74	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)

Return to bug 331085