From c89190e0bfe27ea1929a64ffddc9239d9db0fe47 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:29:06 +0200 Subject: [PATCH] ELBuildized scripting/. --- configure.in | 1 - src/scripting/{Makefile.am => Makefile} | 33 +++++++++---------------- 2 files changed, 11 insertions(+), 23 deletions(-) rename src/scripting/{Makefile.am => Makefile} (55%) diff --git a/configure.in b/configure.in index 224abe15..ad9e0e95 100644 --- a/configure.in +++ b/configure.in @@ -1330,7 +1330,6 @@ AC_OUTPUT([ \ src/intl/gettext/ref-del.sed \ src/mime/Makefile \ src/mime/backend/Makefile \ - src/scripting/Makefile \ src/viewer/Makefile \ src/viewer/text/Makefile ]) diff --git a/src/scripting/Makefile.am b/src/scripting/Makefile similarity index 55% rename from src/scripting/Makefile.am rename to src/scripting/Makefile index 1974bb1f..5f8589a4 100644 --- a/src/scripting/Makefile.am +++ b/src/scripting/Makefile @@ -1,47 +1,36 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.12 2005/06/02 18:01:34 witekfl Exp $ +path_to_top=../.. +include $(path_to_top)/Makefile.config -include $(top_srcdir)/Makefile.base - -if CONFIG_GUILE +ifeq ($(CONFIG_GUILE),yes) guiledir = guile guileobj = $(guiledir)/core.o $(guiledir)/guile.o $(guiledir)/hooks.o endif -if CONFIG_LUA +ifeq ($(CONFIG_LUA),yes) luadir = lua luaobj = $(luadir)/core.o $(luadir)/hooks.o $(luadir)/lua.o endif -if CONFIG_PERL +ifeq ($(CONFIG_PERL),yes) perldir = perl perlobj = $(perldir)/core.o $(perldir)/hooks.o $(perldir)/perl.o endif -if CONFIG_PYTHON +ifeq ($(CONFIG_PYTHON),yes) pythondir = python pythonobj = $(pythondir)/core.o $(pythondir)/hooks.o $(pythondir)/python.o endif -if CONFIG_RUBY +ifeq ($(CONFIG_RUBY),yes) rubydir = ruby rubyobj = $(rubydir)/core.o $(rubydir)/hooks.o $(rubydir)/ruby.o endif SUBDIRS = $(guiledir) $(luadir) $(perldir) $(pythondir) $(rubydir) -EXTRA_DIST = TODO +OBJS = scripting.o $(guileobj) $(luaobj) $(perlobj) $(pythonobj) $(rubyobj) -noinst_LIBRARIES = libscripting.a - -libscripting_a_LIBADD = \ - $(guileobj) \ - $(luaobj) \ - $(perlobj) \ - $(pythonobj) \ - $(rubyobj) - -libscripting_a_SOURCES = \ - scripting.c \ - scripting.h +all-l: libscripting.a +libscripting.a: $(OBJS) +include $(path_to_top)/Makefile.lib