* The Xlib plugin properly builds.

git-svn-id: svn://svn.zoy.org/elk/trunk@45 55e467fa-43c5-0310-a8a2-de718669efc6

Makefile.am

@@ -1,6 +1,6 @@
 NULL = 
 
-SUBDIRS = src lib scm
+SUBDIRS = include src lib scm
 DIST_SUBDIRS = $(SUBDIRS) autotools debian doc examples util
 
 EXTRA_DIST = \

configure.ac

@@ -371,9 +371,11 @@ AC_OUTPUT([
   debian/Makefile
   doc/Makefile
   examples/Makefile
+  include/Makefile
   lib/Makefile
   lib/misc/Makefile
   lib/unix/Makefile
+  lib/xlib/Makefile
   scm/Makefile
   src/Makefile
   util/Makefile

lib/Makefile.am

@@ -1 +1 @@
-SUBDIRS = misc unix xaw xlib xm xt
+SUBDIRS = misc unix xaw xlib #xm xt

lib/xlib/Makefile

@@ -1,24 +0,0 @@
-SHELL=/bin/sh
-MAKE=make
-
-all: default
-
-Makefile.local: build ../../config/system ../../config/site
-	$(SHELL) ./build
-
-default: Makefile.local
-	$(MAKE) -f Makefile.local
-
-install: Makefile.local
-	$(MAKE) -f Makefile.local install
-
-localize: Makefile.local
-
-lint: Makefile.local
-	$(MAKE) -f Makefile.local lint
-
-clean: Makefile.local
-	$(MAKE) -f Makefile.local clean
-
-distclean: Makefile.local
-	$(MAKE) -f Makefile.local distclean

lib/xlib/Makefile.am

@@ -0,0 +1,38 @@
+NULL = 
+
+EXTRA_DIST = MISSING
+
+pkglib_LTLIBRARIES = xlib.la
+
+xlib_la_SOURCES = \
+	client.c \
+	color.c \
+	colormap.c \
+	cursor.c \
+	display.c \
+	error.c \
+	event.c \
+	extension.c \
+	font.c \
+	gcontext.c \
+	grab.c \
+	graphics.c \
+	init.c \
+	key.c \
+	objects.c \
+	pixel.c \
+	pixmap.c \
+	property.c \
+	text.c \
+	type.c \
+	util.c \
+	window.c \
+	wm.c \
+	$(NULL)
+xlib_la_CFLAGS = -I/usr/X11R6/include
+xlib_la_LDFLAGS = -module -avoid-version
+xlib_la_LIBADD = $(top_builddir)/src/libelk.la -L/usr/X11R6/lib -lX11
+
+extensions_HEADERS = xlib.h
+extensionsdir = $(pkgincludedir)/extensions
+

lib/xlib/build

@@ -1,145 +0,0 @@
-. ../../config/system
-. ../../config/site
-
-echo Building Makefile.local...
-cat <<EOT >Makefile.local
-# This Makefile was produced by running ./build in this directory.
-
-SHELL=/bin/sh
-
-CC= ${cc-cc}
-CFLAGS= $cflags $obj_cflags
-LINTFLAGS= $lintflags
-
-INC=	../../include
-
-H=	\$(INC)/compat.h\\
-	\$(INC)/config.h\\
-	\$(INC)/cstring.h\\
-	\$(INC)/exception.h\\
-	\$(INC)/extern.h\\
-	\$(INC)/funcproto.h\\
-	\$(INC)/gc.h\\
-	\$(INC)/misc.h\\
-	\$(INC)/object.h\\
-	\$(INC)/param.h\\
-	\$(INC)/stkmem.h\\
-	\$(INC)/type.h\\
-	xlib.h
-
-C=	client.c\\
-	color.c\\
-	colormap.c\\
-	cursor.c\\
-	display.c\\
-	error.c\\
-	event.c\\
-	extension.c\\
-	font.c\\
-	gcontext.c\\
-	grab.c\\
-	graphics.c\\
-	init.c\\
-	key.c\\
-	objects.c\\
-	pixel.c\\
-	pixmap.c\\
-	property.c\\
-	text.c\\
-	type.c\\
-	util.c\\
-	window.c\\
-	wm.c
-
-O=	client.o\\
-	color.o\\
-	colormap.o\\
-	cursor.o\\
-	display.o\\
-	error.o\\
-	event.o\\
-	extension.o\\
-	font.o\\
-	gcontext.o\\
-	grab.o\\
-	graphics.o\\
-	init.o\\
-	key.o\\
-	objects.o\\
-	pixel.o\\
-	pixmap.o\\
-	property.o\\
-	text.o\\
-	type.o\\
-	util.o\\
-	window.o\\
-	wm.o
-
-all: \$(O) xlib.so
-
-.c.o:
-	\$(CC) \$(CFLAGS) -I\$(INC) $x11_incl -c \$<
-
-client.o:	\$(H) client.c
-color.o:	\$(H) color.c
-colormap.o:	\$(H) colormap.c
-cursor.o:	\$(H) cursor.c
-display.o:	\$(H) display.c
-error.o:	\$(H) error.c
-event.o:	\$(H) event.c
-extension.o:	\$(H) extension.c
-font.o:		\$(H) font.c
-gcontext.o:	\$(H) gcontext.c
-grab.o:		\$(H) grab.c
-graphics.o:	\$(H) graphics.c
-init.o:		\$(H) init.c
-key.o:		\$(H) key.c
-objects.o:	\$(H) objects.c
-pixel.o:	\$(H) pixel.c
-pixmap.o:	\$(H) pixmap.c
-property.o:	\$(H) property.c
-text.o:		\$(H) text.c
-type.o:		\$(H) type.c
-util.o:		\$(H) util.c
-window.o:	\$(H) window.c
-wm.o:		\$(H) wm.c
-
-xlib.pre: \$(O)
-	../../scripts/makedl \$@ \$(O)
-
-xlib.so: \$(O)
-	gcc -shared -o \$@ \$(O) $libxlib -lc
-
-install: xlib.so
-	-@if [ ! -d $install_dir/lib ]; then \\
-	    echo mkdir $install_dir/lib; \\
-	    mkdir $install_dir/lib; \\
-	fi
-	-@if [ ! -d $install_dir/lib/elk ]; then \\
-	    echo mkdir $install_dir/lib/elk; \\
-	    mkdir $install_dir/lib/elk; \\
-	fi
-	cp xlib.so $install_dir/lib/elk
-	-@if [ ! -d $install_dir/include ]; then \\
-	    echo mkdir $install_dir/include; \\
-	    mkdir $install_dir/include; \\
-	fi
-	-@if [ ! -d $install_dir/include/elk ]; then \\
-	    echo mkdir $install_dir/include/elk; \\
-	    mkdir $install_dir/include/elk; \\
-	fi
-	-@if [ ! -d $install_dir/include/elk/extensions ]; then \\
-	    echo mkdir $install_dir/include/elk/extensions; \\
-	    mkdir $install_dir/include/elk/extensions; \\
-	fi
-	cp xlib.h $install_dir/include/elk/extensions
-
-lint:
-	lint \$(LINTFLAGS) -I\$(INC) $x11_incl \$(C)
-
-clean:
-	rm -f *.so *.o xlib.pre core
-
-distclean:
-	rm -f *.so *.o xlib.pre core lint.out Makefile.local
-EOT