r338 - trunk/src/target/gsm

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Thu Dec 7 16:17:42 CET 2006


Author: mickey
Date: 2006-12-07 15:17:42 +0000 (Thu, 07 Dec 2006)
New Revision: 338

Added:
   trunk/src/target/gsm/configure.ac
   trunk/src/target/gsm/libgsmd.pc.in
Removed:
   trunk/src/target/gsm/configure.in
Modified:
   trunk/src/target/gsm/Makefile.am
   trunk/src/target/gsm/autogen.sh
Log:
gsm: modernize autotool framework and pkgconfigize it


Modified: trunk/src/target/gsm/Makefile.am
===================================================================
--- trunk/src/target/gsm/Makefile.am	2006-12-07 15:03:15 UTC (rev 337)
+++ trunk/src/target/gsm/Makefile.am	2006-12-07 15:17:42 UTC (rev 338)
@@ -8,3 +8,8 @@
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
+
+pcdata_DATA= libgsmd.pc
+pcdatadir= $(libdir)/pkgconfig
+
+EXTRA_DIST= $(pcdata_DATA)

Modified: trunk/src/target/gsm/autogen.sh
===================================================================
--- trunk/src/target/gsm/autogen.sh	2006-12-07 15:03:15 UTC (rev 337)
+++ trunk/src/target/gsm/autogen.sh	2006-12-07 15:17:42 UTC (rev 338)
@@ -1,18 +1,5 @@
-#!/bin/sh
+#! /bin/sh
+autoreconf -v --install || exit 1
+glib-gettextize --force --copy || exit 1
+./configure --enable-maintainer-mode "$@"
 
-run ()
-{
-    echo "running: $*"
-    eval $*
-
-    if test $? != 0 ; then
-	echo "error: while running '$*'"
-	exit 1
-    fi
-}
-
-run aclocal
-#run autoheader
-run libtoolize -f
-run automake -a
-run autoconf

Added: trunk/src/target/gsm/configure.ac
===================================================================
--- trunk/src/target/gsm/configure.ac	2006-12-07 15:03:15 UTC (rev 337)
+++ trunk/src/target/gsm/configure.ac	2006-12-07 15:17:42 UTC (rev 338)
@@ -0,0 +1,27 @@
+AC_PREREQ(2.53)
+AC_INIT(gsmd, 0.0.1, http://www.openmoko.org/)
+AM_INIT_AUTOMAKE()
+AC_CONFIG_SRCDIR(src/gsmd/gsmd.c)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
+AC_ISC_POSIX
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_PROG_LIBTOOL
+
+# base deps
+
+# output stuff
+AC_OUTPUT([
+Makefile
+libgsmd.pc
+src/Makefile
+src/gsmd/Makefile
+src/libgsmd/Makefile
+src/util/Makefile
+include/Makefile
+include/gsmd/Makefile
+include/libgsmd/Makefile
+])
+

Deleted: trunk/src/target/gsm/configure.in
===================================================================
--- trunk/src/target/gsm/configure.in	2006-12-07 15:03:15 UTC (rev 337)
+++ trunk/src/target/gsm/configure.in	2006-12-07 15:17:42 UTC (rev 338)
@@ -1,19 +0,0 @@
-dnl Process this file with autoconf to create configure.
-
-AC_INIT
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(gsmd, 0.0.1)
-
-AC_PROG_CC
-AC_EXEEXT
-AM_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-
-
-AC_ARG_WITH()
-
-dnl Output the makefiles
-AC_OUTPUT(Makefile src/Makefile src/gsmd/Makefile src/libgsmd/Makefile src/util/Makefile
-	  include/Makefile include/gsmd/Makefile include/libgsmd/Makefile)

Added: trunk/src/target/gsm/libgsmd.pc.in
===================================================================
--- trunk/src/target/gsm/libgsmd.pc.in	2006-12-07 15:03:15 UTC (rev 337)
+++ trunk/src/target/gsm/libgsmd.pc.in	2006-12-07 15:17:42 UTC (rev 338)
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libgsmd
+Description: GSM 07.10 Multiplexer Library
+Version: @VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgsmd
+Requires:
+





More information about the commitlog mailing list