Update GNU Makefiles for new lefty

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index ecdfdbba1118f711fe95a3fe78f7a395f74e69d6..c58f7690b77d25171975d7e3f596b16024057938 100644 (file)
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -2,21 +2,49 @@
 
 SUBDIRS = ws os cs2l dot2l examples
 
+# lefty build parameters
+#not useful / old:
+#  FEATURE_CS          coshell support
+#  FEATURE_NETSCAPE    build lefty as a netscape plugin
+#  FEATURE_RUSAGE      print rusage stats on exit
+#  FEATURE_VFORK       use vfork instead of fork
+#  FEATURE_GMAP        build performer version of lefty (source in lefty3d)
+#  FEATURE_MESAGL      assume MesaGL instead of SGI's OpenGL for GMAP
+# FEATURE_MINTSIZE     use int instead of short to hold object sizes.
+#                      allows for larger objects (strings, hash tables, etc.)
+# FEATURE_MS           assume windows system calls (as opposed to UNIX)
+#                      to use when building on ms windows without UWIN
+# FEATURE_X11          assume X11 graphics calls
+# FEATURE_BACKINGSTORE ask X server to use backing store for canvas
+# FEATURE_NEXTAW       when linking with -lnextaw a widget lib ala NeXT
+# FEATURE_XAW3D        when linking with -lXaw3d a nicer looking widget lib
+# FEATURE_WIN32        assume WIN32 graphics calls
+# FEATURE_DOT          when linking in the dot2l code, a graph parser
+
+DOT2L = dot2l
+WM = ws/x11
+OS = os/unix
+
+leftydir = $(pkgdatadir)/lefty
+pdfdir = $(pkgdatadir)/doc/pdf
+
+DEFINES=-DLEFTYPATH=\"$(LEFTYLIBDIR)\" -DHAVE_CONFIG_H \
+        -DFEATURE_MINTSIZE -DFEATURE_DOT -DFEATURE_X11
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/cmd/lefty/ws/x11 \
        -I$(top_srcdir)/cmd/lefty/os/unix \
+       -I$(top_srcdir)/cmd/lefty/cs2l \
        -I$(top_srcdir)/cmd/lefty/dot2l @XAW_INCLUDES@
 
+AM_CFLAGS = $(DEFINES) @X_CFLAGS@
+
 man = lefty.1
 pdf = lefty.pdf
 
-leftydir = $(pkgdatadir)/lefty
-pdfdir = $(pkgdatadir)/doc/pdf
-
-AM_CFLAGS = -DLEFTYPATH=\"$(leftydir)\" -DHAVEDOT @X_CFLAGS@
-
 noinst_HEADERS = code.h common.h display.h exec.h g.h gfxview.h internal.h \
        io.h lex.h mem.h parse.h str.h tbl.h txtview.h
+
 if WITH_X
 bin_PROGRAMS = lefty
 man_MANS = $(man)

diff --git a/cmd/lefty/cs2l/Makefile.am b/cmd/lefty/cs2l/Makefile.am
index 87869bcab0c009445ea19bf11aa5ed15dbde5022..212787665596327c7186230005ff5cdb93688c7c 100644 (file)
--- a/cmd/lefty/cs2l/Makefile.am
+++ b/cmd/lefty/cs2l/Makefile.am
@@ -1,10 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty -DHAVE_CONFIG_H \
+        -DFEATURE_MINTSIZE -DFEATURE_DOT -DFEATURE_X11
 
 noinst_HEADERS = cs2l.h
-# noinst_LTLIBRARIES = libcs2l.la
+noinst_LTLIBRARIES = libcs2l.la
 
-# libcs2l_la_SOURCES = cs2l.c
+libcs2l_la_SOURCES = cs2l.c
 
 EXTRA_DIST = cs2l.c

diff --git a/cmd/lefty/ws/Makefile.am b/cmd/lefty/ws/Makefile.am
index c58b50e76e5662814ccb76973bced9455dc2f53f..3afbf262d3c99a98abe68a8057965da5bb02f4d1 100644 (file)
--- a/cmd/lefty/ws/Makefile.am
+++ b/cmd/lefty/ws/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = x11
+SUBDIRS = x11 gtk none
 
-EXTRA_DIST = mswin32 none
+EXTRA_DIST = mswin32

diff --git a/cmd/lefty/ws/gtk/Makefile.am b/cmd/lefty/ws/gtk/Makefile.am
new file mode 100644 (file)
index 0000000..df1e100
--- /dev/null
+++ b/cmd/lefty/ws/gtk/Makefile.am
@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty -DFEATURE_GTK
+
+noinst_HEADERS = gcommon.h
+noinst_LTLIBRARIES = libws.la
+
+libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \
+       gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c

diff --git a/cmd/lefty/ws/none/Makefile.am b/cmd/lefty/ws/none/Makefile.am
new file mode 100644 (file)
index 0000000..704f7f5
--- /dev/null
+++ b/cmd/lefty/ws/none/Makefile.am
@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty
+
+noinst_HEADERS = gcommon.h
+noinst_LTLIBRARIES = libws.la
+
+libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \
+       gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c

diff --git a/cmd/lefty/ws/x11/Makefile.am b/cmd/lefty/ws/x11/Makefile.am
index 7642d664d5243c17e755edcef7fca9fc4e7f7681..70a7501349d7e0b23680becd030cd89de4b537bb 100644 (file)
--- a/cmd/lefty/ws/x11/Makefile.am
+++ b/cmd/lefty/ws/x11/Makefile.am
@@ -2,9 +2,7 @@
 
 SUBDIRS = libfilereq
 
-AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty @XAW_INCLUDES@
-
-AM_CFLAGS =  @X_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty -DFEATURE_X11 @XAW_INCLUDES@ @X_CFLAGS@
 
 noinst_HEADERS = gcommon.h
 if WITH_X
@@ -13,5 +11,3 @@ endif
 
 libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \
        gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c
-
-EXTRA_DIST = $(libws_la_SOURCES)

diff --git a/configure.ac b/configure.ac
index 9edc9d7f2d0148518dbd02635cc3226911652e5e..462e7d1386a56d7fa7f86eaebf8b97bc2ec8470d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1524,6 +1524,8 @@ AC_CONFIG_FILES(Makefile
        cmd/gvpr/Makefile
         cmd/lefty/ws/x11/libfilereq/Makefile
         cmd/lefty/ws/x11/Makefile
+        cmd/lefty/ws/gtk/Makefile
+        cmd/lefty/ws/none/Makefile
         cmd/lefty/ws/Makefile
         cmd/lefty/os/unix/Makefile
         cmd/lefty/os/Makefile