Install scheme files and build load-scx.scm from load-scx.scm.in (Thanks to Daniel Kobras)
This commit is contained in:
		
							parent
							
								
									3997c60557
								
							
						
					
					
						commit
						aba02de319
					
				
							
								
								
									
										18
									
								
								Makefile.am
								
								
								
								
							
							
						
						
									
										18
									
								
								Makefile.am
								
								
								
								
							| 
						 | 
					@ -1,17 +1 @@
 | 
				
			||||||
SUBDIRS = c
 | 
					SUBDIRS = c scheme
 | 
				
			||||||
 | 
					 | 
				
			||||||
scheme/load-scx.scm:
 | 
					 | 
				
			||||||
	(echo '(user)';								\
 | 
					 | 
				
			||||||
		echo "(load-package 'dynamic-externals)";			\
 | 
					 | 
				
			||||||
		echo "(open 'dynamic-externals)";				\
 | 
					 | 
				
			||||||
		echo "(open 'external-calls)";					\
 | 
					 | 
				
			||||||
		echo '(run ';							\
 | 
					 | 
				
			||||||
		echo "	 '(let ((initializer-name \"scx_init_xlib\")";		\
 | 
					 | 
				
			||||||
		echo '		(module-file "$(prefix)/lib/libscx.so"))';	\
 | 
					 | 
				
			||||||
		echo '	    (dynamic-load module-file)';			\
 | 
					 | 
				
			||||||
		echo '	    (call-external (get-external initializer-name))))';	\
 | 
					 | 
				
			||||||
		echo '(config)';						\
 | 
					 | 
				
			||||||
		echo '(load "$(prefix)/scheme/xlib/xlib-interfaces.scm")';	\
 | 
					 | 
				
			||||||
		echo '(load "$(prefix)/scheme/xlib/xlib-packages.scm")';	\
 | 
					 | 
				
			||||||
	) > $@
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
 | 
					INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
 | 
				
			||||||
	-I@top_srcdir@/c -I@scsh_includes@
 | 
						-I@top_srcdir@/c -I@scsh_includes@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
lib_LTLIBRARIES = libscx.la
 | 
					pkglib_LTLIBRARIES = libscx.la
 | 
				
			||||||
 | 
					
 | 
				
			||||||
libscx_la_SOURCES = \
 | 
					libscx_la_SOURCES = \
 | 
				
			||||||
        client.c colormap.c cursor.c display.c error.c event-types.c \
 | 
					        client.c colormap.c cursor.c display.c error.c event-types.c \
 | 
				
			||||||
| 
						 | 
					@ -10,4 +10,4 @@ libscx_la_SOURCES = \
 | 
				
			||||||
	wm.c xlib.h
 | 
						wm.c xlib.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
libscx_la_LIBADD = $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lX11
 | 
					libscx_la_LIBADD = $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lX11
 | 
				
			||||||
 | 
					libscx_la_LDFLAGS= -avoid-version -module
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -66,4 +66,4 @@
 | 
				
			||||||
	AC_SUBST(x_libraries)
 | 
						AC_SUBST(x_libraries)
 | 
				
			||||||
	AC_SUBST(extra_objects)
 | 
						AC_SUBST(extra_objects)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
AC_OUTPUT([Makefile c/Makefile c/xlib/Makefile])
 | 
					AC_OUTPUT([Makefile c/Makefile c/xlib/Makefile scheme/Makefile])
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,53 @@
 | 
				
			||||||
 | 
					pkgdata_SCRIPTS=load-scx.scm
 | 
				
			||||||
 | 
					nobase_pkgdata_SCRIPTS= \
 | 
				
			||||||
 | 
						examples/hello-xft.scm \
 | 
				
			||||||
 | 
						examples/hello.scm \
 | 
				
			||||||
 | 
						examples/picture.scm \
 | 
				
			||||||
 | 
						examples/regions.scm \
 | 
				
			||||||
 | 
						examples/scxev.scm \
 | 
				
			||||||
 | 
						libs/libs-interfaces.scm \
 | 
				
			||||||
 | 
						libs/libs-packages.scm \
 | 
				
			||||||
 | 
						libs/xft.scm \
 | 
				
			||||||
 | 
						libs/xpm.scm \
 | 
				
			||||||
 | 
						libs/xrender.scm \
 | 
				
			||||||
 | 
						xlib/atom.scm \
 | 
				
			||||||
 | 
						xlib/client.scm \
 | 
				
			||||||
 | 
						xlib/colormap.scm \
 | 
				
			||||||
 | 
						xlib/cursor.scm \
 | 
				
			||||||
 | 
						xlib/display.scm \
 | 
				
			||||||
 | 
						xlib/error.scm \
 | 
				
			||||||
 | 
						xlib/event-types.scm \
 | 
				
			||||||
 | 
						xlib/event.scm \
 | 
				
			||||||
 | 
						xlib/extension.scm \
 | 
				
			||||||
 | 
						xlib/font.scm \
 | 
				
			||||||
 | 
						xlib/gcontext.scm \
 | 
				
			||||||
 | 
						xlib/grab.scm \
 | 
				
			||||||
 | 
						xlib/graphics.scm \
 | 
				
			||||||
 | 
						xlib/key.scm \
 | 
				
			||||||
 | 
						xlib/pixmap.scm \
 | 
				
			||||||
 | 
						xlib/property.scm \
 | 
				
			||||||
 | 
						xlib/region.scm \
 | 
				
			||||||
 | 
						xlib/sync-event.scm \
 | 
				
			||||||
 | 
						xlib/text.scm \
 | 
				
			||||||
 | 
						xlib/utility.scm \
 | 
				
			||||||
 | 
						xlib/visual.scm \
 | 
				
			||||||
 | 
						xlib/window.scm \
 | 
				
			||||||
 | 
						xlib/wm.scm \
 | 
				
			||||||
 | 
						xlib/xlib-interfaces.scm \
 | 
				
			||||||
 | 
						xlib/xlib-packages.scm \
 | 
				
			||||||
 | 
						xt/resource-types.scm \
 | 
				
			||||||
 | 
						xt/widget-type.scm \
 | 
				
			||||||
 | 
						xt/widget.scm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTRA_DIST= $(pkgdata_SCRIPTS) $(nobase_pkgdata_SCRIPTS)
 | 
				
			||||||
 | 
					CLEANFILES= load-scx.scm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					load-scx.scm: $(srcdir)/load-scx.scm.in
 | 
				
			||||||
 | 
						sed -e "s|@scxdatadir@|`pwd`/$(srcdir)|g" \
 | 
				
			||||||
 | 
						    -e "s|@scxlibdir@|`pwd`/../c/xlib/.libs|g" $< > $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					install-data-hook:
 | 
				
			||||||
 | 
						sed -e "s|@scxdatadir@|$(pkgdatadir)|g" \
 | 
				
			||||||
 | 
						    -e "s|@scxlibdir@|$(pkglibdir)|g" \
 | 
				
			||||||
 | 
							$(srcdir)/load-scx.scm.in \
 | 
				
			||||||
 | 
							> $(DESTDIR)/$(pkgdatadir)/load-scx.scm
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,13 @@
 | 
				
			||||||
 | 
					(user)
 | 
				
			||||||
 | 
					(load-package 'dynamic-externals)
 | 
				
			||||||
 | 
					(open 'dynamic-externals)
 | 
				
			||||||
 | 
					(open 'external-calls)
 | 
				
			||||||
 | 
					(run '(let ((initializer-name "scx_init_xlib")
 | 
				
			||||||
 | 
					            (module-file "@scxlibdir@/libscx.so"))
 | 
				
			||||||
 | 
					        (dynamic-load module-file)
 | 
				
			||||||
 | 
					        (call-external (get-external initializer-name))))
 | 
				
			||||||
 | 
					(config)
 | 
				
			||||||
 | 
					(load "@scxdatadir@/xlib/xlib-interfaces.scm")
 | 
				
			||||||
 | 
					(load "@scxdatadir@/xlib/xlib-packages.scm")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue