Prep for standalone release.

diff --git a/Makefile.am b/Makefile.am
index 3a4b72dc3df96cac5357a2f5590c60c0be7c83a7..46fa96b25236b3c25f1099875f66854396192b9b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.5 1999/07/27 18:59:09 mdw Exp $
+## $Id: Makefile.am,v 1.6 1999/11/11 19:54:37 mdw Exp $
 ##
 ## Makefile for mgLib
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.6  1999/11/11 19:54:37  mdw
+## Prep for standalone release.
+##
 ## Revision 1.5  1999/07/27 18:59:09  mdw
 ## Fix relative order of `automake' and `autoconf'.
 ##
@@ -47,10 +50,10 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-lib_LIBRARIES = libmgLib.a
+lib_LTLIBRARIES = libmgLib.la
+bin_SCRIPTS = mgLib-config
+libmgLib_la_LDFLAGS = -version-info 2:0:1
 pkginclude_HEADERS = msg.h mdwfocus.h cancel.h
-
-INCLUDES = -I$(srcdir)/..
-libmgLib_a_SOURCES = msg.c mdwfocus.c cancel.c
+libmgLib_la_SOURCES = msg.c mdwfocus.c cancel.c
 
 ##----- That's all, folks ---------------------------------------------------

diff --git a/cancel.c b/cancel.c
index ddaefef147f1d714f2d7b594371dc457913c8114..9ddcf92872c760fbfbb35803227dc725fcb69bd9 100644 (file)
--- a/cancel.c
+++ b/cancel.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: cancel.c,v 1.4 1999/05/06 19:51:47 mdw Exp $
+ * $Id: cancel.c,v 1.5 1999/11/11 19:54:37 mdw Exp $
  *
  * Handle Escape keypresses, directing them to cancel buttons
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: cancel.c,v $
+ * Revision 1.5  1999/11/11 19:54:37  mdw
+ * Prep for standalone release.
+ *
  * Revision 1.4  1999/05/06 19:51:47  mdw
  * Reformatted the LGPL notice a little bit.
  *
@@ -45,8 +48,6 @@
  *
  */
 
-#ifdef HAVE_GTK
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <gtk/gtk.h>
@@ -86,7 +87,3 @@ void cancel(GtkWindow *win, GtkWidget *w)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
-
-#else
-  int mgLib_cancel = 0;
-#endif

diff --git a/configure.in b/configure.in
index fa5bfa0007ee2fac7ec2cabc907da54436c217eb..80c19277a8b54eb1318ef1db3ed4fbc40abe2f66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.6 1999/05/06 19:51:48 mdw Exp $
+dnl $Id: configure.in,v 1.7 1999/11/11 19:54:37 mdw Exp $
 dnl
 dnl Configuration script for mgLib
 dnl
@@ -29,6 +29,9 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.7  1999/11/11 19:54:37  mdw
+dnl Prep for standalone release.
+dnl
 dnl Revision 1.6  1999/05/06 19:51:48  mdw
 dnl Reformatted the LGPL notice a little bit.
 dnl
@@ -50,20 +53,19 @@ dnl Initial version.
 dnl
 
 AC_INIT(mdwfocus.c)
-AM_INIT_AUTOMAKE(mgLib, 1.0.0)
+AM_INIT_AUTOMAKE(mgLib, 1.1.0)
 
 AC_PROG_CC
-mdw_GCC_FLAGS
 AC_CHECK_PROG(AR, ar, ar)
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 
+mdw_MLIB(1.6.0)
 AM_PATH_GTK(1.0.0,
-            [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"
-            AC_DEFINE(HAVE_GTK)],
-            [AC_MSG_WARN([couldn't find GTK])])
+            [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
+            [AC_MSG_ERROR([couldn't find GTK])])
 
 mdw_OPT_mLib_DEBUG(mgLib)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile mgLib-config)
 
 dnl ----- That's all, folks -------------------------------------------------

diff --git a/mdwfocus.c b/mdwfocus.c
index 5a03d50c48030e372a14df6f8a01f75b5ff63e38..b7ee5b085c8796dbb01e4cfe6b8d963ac8523537 100644 (file)
--- a/mdwfocus.c
+++ b/mdwfocus.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mdwfocus.c,v 1.4 1999/05/06 19:51:48 mdw Exp $
+ * $Id: mdwfocus.c,v 1.5 1999/11/11 19:54:37 mdw Exp $
  *
  * Tell my hacked `fvwm' to focus this window
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mdwfocus.c,v $
+ * Revision 1.5  1999/11/11 19:54:37  mdw
+ * Prep for standalone release.
+ *
  * Revision 1.4  1999/05/06 19:51:48  mdw
  * Reformatted the LGPL notice a little bit.
  *
@@ -45,8 +48,6 @@
  *
  */
 
-#ifdef HAVE_GTK
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <gtk/gtk.h>
@@ -80,7 +81,3 @@ void mdwfocus(GtkWidget *w)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
-
-#else
-  int mgLib_mdwfocus = 0;
-#endif

diff --git a/msg.c b/msg.c
index d9be0ca04037ef54acc2863890801178706275df..7ec62a10494fd2f9ce9d757af498c7de614af17a 100644 (file)
--- a/msg.c
+++ b/msg.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: msg.c,v 1.7 1999/05/21 22:08:20 mdw Exp $
+ * $Id: msg.c,v 1.8 1999/11/11 19:54:37 mdw Exp $
  *
  * Display a message and get an answer
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: msg.c,v $
+ * Revision 1.8  1999/11/11 19:54:37  mdw
+ * Prep for standalone release.
+ *
  * Revision 1.7  1999/05/21 22:08:20  mdw
  * Take advantage of new dynamic string macros.
  *
@@ -54,8 +57,6 @@
  *
  */
 
-#ifdef HAVE_GTK
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdarg.h>
@@ -202,7 +203,3 @@ int msg(const char *buttons, const char *msg, ...)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
-
-#else
-  int mgLib_msg = 0;
-#endif

diff --git a/setup b/setup
index 27dde72e73ab07b3759f67186c11151334b30f54..08d308e36eef64bc4c41bcf20780901abb5d7221 100755 (executable)
--- a/setup
+++ b/setup
@@ -2,6 +2,7 @@
 
 set -e
 mklinks
+libtoolize
 mkaclocal
 autoconf
 automake