Download as
Browse Code »

Commit 9371d77c40e6820ff1aafdca6014c09d22c5a356

Authored by Perry Werneck
1 parent 78aeb953
Exists in master and in 1 other branch develop

Fixing soname for windows.

Showing 2 changed files with 24 additions and 44 deletions   Show diff stats
client/Makefile.in
  Diff comments   View file @9371d77
... ... @@ -175,32 +175,15 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \
175 175 #---[ Release Targets ]------------------------------------------------------------------
176 176  
177 177 all: \
178   - $(BINRLS)/lib$(MODULE_NAME)@DLLEXT@ \
  178 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
179 179 $(BINRLS)/lib$(MODULE_NAME).a \
180 180 $(POTDIR)/$(MODULE_NAME).pot
181 181  
182 182 Release: \
183   - $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \
  183 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
184 184 $(BINRLS)/lib$(MODULE_NAME).a
185 185  
186   -$(BINRLS)/lib$(MODULE_NAME)@DLLEXT@: \
187   - $(BINRLS)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
188   -
189   - @echo $< ...
190   - @rm -f $@
191   - @$(LN_S) \
192   - $(notdir $^) \
193   - $@
194   -
195   -$(BINRLS)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
196   - $(BINRLS)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
197   -
198   - @rm -f $@
199   - @$(LN_S) \
200   - $(notdir $^) \
201   - $@
202   -
203   -$(BINRLS)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  186 +$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \
204 187 $(foreach SRC, $(basename $(MAIN_SOURCES)), $(OBJRLS)/$(SRC).o)
205 188  
206 189 @$(MKDIR) $(@D)
... ... @@ -209,7 +192,7 @@ $(BINRLS)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSI
209 192 -shared -Wl,-soname,$(@F) \
210 193 -o $@ \
211 194 $(LDFLAGS) \
212   - $(foreach SRC, $(basename $(MAIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
  195 + $^
213 196 $(LIBS) \
214 197 $(GTK_LIBS)
215 198  
... ... @@ -234,8 +217,8 @@ install-shared: \
234 217 $(DESTDIR)/$(libdir)
235 218  
236 219 @$(INSTALL_PROGRAM) \
237   - $(BINRLS)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
238   - $(DESTDIR)/$(libdir)
  220 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
  221 + $(DESTDIR)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
239 222  
240 223 @$(LN_S) \
241 224 lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
... ... @@ -284,37 +267,20 @@ Debug: \
284 267  
285 268 $(BINDBG)/$(MODULE_NAME)-client@EXEEXT@: \
286 269 $(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o) \
287   - $(BINDBG)/lib$(MODULE_NAME)@DLLEXT@
  270 + $(BINDBG)/lib$(MODULE_NAME)@LIBEXT@
288 271  
289 272 @$(MKDIR) $(@D)
290 273 @echo $< ...
291 274 @$(LD) \
292 275 -o $@ \
293   - $(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o) \
  276 + $^ \
294 277 -L$(BINDBG) -l$(MODULE_NAME)\
295 278 -Wl,-rpath,$(BINDBG) \
296 279 $(LDFLAGS) \
297 280 $(LIBS)
298 281  
299 282  
300   -$(BINDBG)/lib$(MODULE_NAME)@DLLEXT@: \
301   - $(BINDBG)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
302   -
303   - @echo $< ...
304   - @rm -f $@
305   - @$(LN_S) \
306   - $(notdir $^) \
307   - $@
308   -
309   -$(BINDBG)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
310   - $(BINDBG)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
311   -
312   - @rm -f $@
313   - @$(LN_S) \
314   - $(notdir $^) \
315   - $@
316   -
317   -$(BINDBG)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  283 +$(BINDBG)/lib$(MODULE_NAME)@LIBEXT@: \
318 284 $(foreach SRC, $(basename $(MAIN_SOURCES)), $(OBJDBG)/$(SRC).o)
319 285  
320 286 @$(MKDIR) $(@D)
... ... @@ -323,7 +289,7 @@ $(BINDBG)/lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSI
323 289 -shared -Wl,-soname,$(@F) \
324 290 -o $@ \
325 291 $(LDFLAGS) \
326   - $(foreach SRC, $(basename $(MAIN_SOURCES)), $(OBJDBG)/$(SRC).o) \
  292 + $^ \
327 293 $(LIBS)
328 294  
329 295  
... ...
configure.ac
  Diff comments   View file @9371d77
... ... @@ -156,6 +156,20 @@ AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
156 156 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
157 157 AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
158 158  
  159 +case "$host" in
  160 + *-mingw32|*-pc-msys)
  161 + AC_SUBST(LIBEXT,.dll)
  162 + ;;
  163 +
  164 + s390x-*)
  165 + AC_SUBST(LIBEXT,.so)
  166 + ;;
  167 +
  168 + *)
  169 + AC_SUBST(LIBEXT,.so.$app_vrs_major.$app_vrs_minor)
  170 +
  171 +esac
  172 +
159 173 dnl ---------------------------------------------------------------------------
160 174 dnl Build options
161 175 dnl ---------------------------------------------------------------------------
... ...