File libgarmin-svn320-shared.diff of Package libgarmin

Overview Repositories Revisions Requests Users Attributes Meta

File libgarmin-svn320-shared.diff of Package libgarmin

diff -Naur libgarmin.orig/autosh.sh libgarmin/autosh.sh
--- libgarmin.orig/autosh.sh	2012-11-12 14:41:51.328299049 +0100
+++ libgarmin/autosh.sh	2012-12-13 10:17:45.607631855 +0100
@@ -1,2 +1,2 @@
 #! /bin/bash
-aclocal && autoheader && automake --add-missing && autoreconf && ./configure
+autoreconf --force --install
diff -Naur libgarmin.orig/configure.ac libgarmin/configure.ac
--- libgarmin.orig/configure.ac	2012-11-12 14:41:51.321299502 +0100
+++ libgarmin/configure.ac	2012-12-13 10:17:45.637629579 +0100
@@ -12,7 +12,18 @@
         CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type"
 fi
 
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+LT_LIBGARMIN_CURRENT=0
+LT_LIBGARMIN_REVISION=0
+LT_LIBGARMIN_AGE=0
+AC_SUBST(LT_LIBGARMIN_CURRENT)
+AC_SUBST(LT_LIBGARMIN_REVISION)
+AC_SUBST(LT_LIBGARMIN_AGE)
+
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
 # Checks for libraries.
 # FIXME: Replace `main' with a function in `-lgarmin':
 #AC_CHECK_LIB([garmin], [main])
diff -Naur libgarmin.orig/Makefile.inc libgarmin/Makefile.inc
--- libgarmin.orig/Makefile.inc	2012-11-12 14:41:50.723315378 +0100
+++ libgarmin/Makefile.inc	2012-12-13 10:17:45.637629579 +0100
@@ -1,11 +1,11 @@
 pkgdocdir=$(pkgdatadir)/doc
 AM_CPPFLAGS =
 if !TARGET_WIN32CE
-CFLAGS += -shared
+#CFLAGS += -shared
 AM_CPPFLAGS += -fPIC
 endif
 if DEBUG
-CFLAGS += -g
+#CFLAGS += -g
 AM_CPPFLAGS += -DDEBUG
 endif
 
diff -Naur libgarmin.orig/src/Makefile.am libgarmin/src/Makefile.am
--- libgarmin.orig/src/Makefile.am	2012-11-12 14:41:50.732314807 +0100
+++ libgarmin/src/Makefile.am	2012-12-13 10:17:39.583789799 +0100
@@ -2,9 +2,9 @@
 
 AM_CPPFLAGS += -DDATAPREFIX=\"@datarootdir@\" 
 
-lib_LIBRARIES = libgarmin.a
+lib_LTLIBRARIES = libgarmin.la
 
-libgarmin_a_SOURCES = GarminTypedef.h  garmin_fat.c  garmin_rgn.h \
+libgarmin_la_SOURCES = GarminTypedef.h  garmin_fat.c  garmin_rgn.h \
 		bsp.c  garmin_fat.h  garmin_subdiv.c libgarmin_priv.h \
 		bsp.h garmin_lbl.c  garmin_subdiv.h \
 		garmin_lbl.h  garmin_typ.c list.c \
@@ -18,12 +18,15 @@
 		garmin_mdr.c garmin_mdr.h	\
 		garmin_route.c align.h extras.h
 
-nodist_libgarmin_a_SOURCES=
+nodist_libgarmin_la_SOURCES=
 if HAVEEXTRAS
-nodist_libgarmin_a_SOURCES+=extras.c
+nodist_libgarmin_la_SOURCES+=extras.c
 endif
 
+libgarmin_la_LDFLAGS = -version-info 0:0:0
+
 include_HEADERS = libgarmin.h
 
 clean-local:
 	rm -rf *~ *.bak core
+
diff -Naur libgarmin.orig/utils/Makefile.am libgarmin/utils/Makefile.am
--- libgarmin.orig/utils/Makefile.am	2012-11-12 14:41:50.957310134 +0100
+++ libgarmin/utils/Makefile.am	2012-12-13 10:17:39.654788227 +0100
@@ -1,9 +1,9 @@
 AM_CPPFLAGS=-I$(top_srcdir)/src -Wall
 bin_PROGRAMS = garxtract garxor
 noinst_PROGRAMS = gartest bsptest garroute
-gartest_LDADD = ../src/libgarmin.a
-garxtract_LDADD = ../src/libgarmin.a
-garroute_LDADD = ../src/libgarmin.a
+gartest_LDADD = ../src/libgarmin.la
+garxtract_LDADD = ../src/libgarmin.la
+garroute_LDADD = ../src/libgarmin.la
 
 clean-local:
 	rm -rf *~ *.bak core

Places

File libgarmin-svn320-shared.diff of Package libgarmin

Places