wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

removing version tag from library

This commit is contained in:
Perberos 2011-11-07 22:13:36 -03:00
parent c7e1c2017b
commit e27c237301
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -37,6 +37,7 @@ AC_PROG_OBJC
LT_PREREQ([2.2.6]) LT_PREREQ([2.2.6])
LT_INIT(disable-static) LT_INIT(disable-static)
#unused (maybe)
PLUMA_API_VERSION=2.20 PLUMA_API_VERSION=2.20
AC_SUBST(PLUMA_API_VERSION) AC_SUBST(PLUMA_API_VERSION)
@ -484,9 +485,9 @@ fi
# on win32 plugins must be able to resolve all symbols at link time # on win32 plugins must be able to resolve all symbols at link time
# so we create a lib # so we create a lib
if test "$platform_win32" = yes; then if test "$platform_win32" = yes; then
PLUMA_IMPLIB="-lpluma-$PLUMA_API_VERSION" PLUMA_IMPLIB="-lpluma"
PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma-\$(PLUMA_API_VERSION).a" PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma.a"
LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma-\$(PLUMA_API_VERSION).a" LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma.a"
if test "$os_win32" = yes; then if test "$os_win32" = yes; then
PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows" PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
LOADER_LIBTOOL_FLAGS="${LOADER_LIBTOOL_FLAGS} -mwindows" LOADER_LIBTOOL_FLAGS="${LOADER_LIBTOOL_FLAGS} -mwindows"

6
data/Makefile.am
View File

@ -11,10 +11,10 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
man_MANS = pluma.1 man_MANS = pluma.1
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pluma-@PLUMA_API_VERSION@.pc pkgconfig_DATA = pluma.pc
pluma-@PLUMA_API_VERSION@.pc: pluma.pc pluma.pc: pluma.pc
cp pluma.pc pluma-@PLUMA_API_VERSION@.pc cp pluma.pc pluma.pc
bugreportdir = $(libexecdir)/pluma bugreportdir = $(libexecdir)/pluma
bugreport_SCRIPTS = pluma-bugreport.sh bugreport_SCRIPTS = pluma-bugreport.sh

2
data/pluma.pc.in
View File

@ -7,5 +7,5 @@ Name: pluma
Description: pluma Description: pluma
Requires: gtksourceview-2.0 Requires: gtksourceview-2.0
Version: @VERSION@ Version: @VERSION@
Cflags: -I${includedir}/pluma-@PLUMA_API_VERSION@ Cflags: -I${includedir}/pluma
Libs: -L${libdir} @PLUMA_IMPLIB@ Libs: -L${libdir} @PLUMA_IMPLIB@

6
pluma/Makefile.am
View File

@ -26,7 +26,7 @@ pluma_SOURCES = \
pluma_LDADD = libpluma.la $(PLUMA_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS) pluma_LDADD = libpluma.la $(PLUMA_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS)
if PLATFORM_WIN32 if PLATFORM_WIN32
pluma_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libpluma-$(PLUMA_API_VERSION).a pluma_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libpluma.a
if OS_WIN32 if OS_WIN32
pluma_LDFLAGS += -mwindows pluma_LDFLAGS += -mwindows
endif endif
@ -121,7 +121,7 @@ if !ENABLE_GVFS_METADATA
INST_H_FILES += pluma-metadata-manager.h INST_H_FILES += pluma-metadata-manager.h
endif endif
headerdir = $(prefix)/include/pluma-@PLUMA_API_VERSION@/pluma headerdir = $(prefix)/include/pluma/pluma
header_DATA = \ header_DATA = \
$(INST_H_FILES) $(INST_H_FILES)
@ -225,7 +225,7 @@ dist-hook:
install-exec-hook: install-exec-hook:
if PLATFORM_WIN32 if PLATFORM_WIN32
$(mkinstalldirs) "$(DESTDIR)$(libdir)" $(mkinstalldirs) "$(DESTDIR)$(libdir)"
$(INSTALL_DATA) libpluma-$(PLUMA_API_VERSION).a "$(DESTDIR)$(libdir)" $(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)"
else else
rm -f $(DESTDIR)$(bindir)/mate-text-editor rm -f $(DESTDIR)$(bindir)/mate-text-editor
ln -s pluma $(DESTDIR)$(bindir)/mate-text-editor ln -s pluma $(DESTDIR)$(bindir)/mate-text-editor