test (avoid-version)
Sylvestre Ledru [Fri, 12 Jan 2007 12:19:29 +0000 (12:19 +0000)]
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in

index aebf6e1..033a6e8 100644 (file)
@@ -3,11 +3,14 @@
 ### INRIA - Scilab 2006 
 ##########
 
+
+MODULECOMMONFLAGS = -no-undefined -module -avoid-version
+
 LOCALIZATION_C_SOURCES = src/hashtable_localization.c \
 src/localization.c
 
 libscilocalization_la_CFLAGS=  -Iincludes/ -Isrc/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/libs/hashtable/ $(XML_FLAGS)
-libscilocalization_la_LDFLAGS= $(XML_LIBS)
+libscilocalization_la_LDFLAGS= $(XML_LIBS) $(MODULECOMMONFLAGS)
 
 pkglib_LTLIBRARIES = libscilocalization.la
 
@@ -39,7 +42,7 @@ libscilocalization_la_etc_DATA = etc/localization.quit etc/localization.start
 
 
 ####┬álocalization : include files ####
-libscilocalization_la_includedir=$(includedir)/localization
+libscilocalization_la_includedir=$(sciincludedir)/localization
 libscilocalization_la_include_HEADERS = includes/localization.h
 
 include $(top_srcdir)/Makefile.incl.am
index 2d3f1de..8ccba81 100644 (file)
@@ -105,7 +105,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -122,7 +121,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -153,7 +151,6 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OCAMLC = @OCAMLC@
 OCAMLDEP = @OCAMLDEP@
@@ -243,11 +240,12 @@ target_alias = @target_alias@
 tcldir = @tcldir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+MODULECOMMONFLAGS = -no-undefined -module -avoid-version
 LOCALIZATION_C_SOURCES = src/hashtable_localization.c \
 src/localization.c
 
 libscilocalization_la_CFLAGS = -Iincludes/ -Isrc/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/libs/hashtable/ $(XML_FLAGS)
-libscilocalization_la_LDFLAGS = $(XML_LIBS)
+libscilocalization_la_LDFLAGS = $(XML_LIBS) $(MODULECOMMONFLAGS)
 pkglib_LTLIBRARIES = libscilocalization.la
 libscilocalization_la_SOURCES = $(LOCALIZATION_C_SOURCES) 
 libscilocalization_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
@@ -270,7 +268,7 @@ libscilocalization_la_etcdir = $(target)/etc
 libscilocalization_la_etc_DATA = etc/localization.quit etc/localization.start
 
 ####┬álocalization : include files ####
-libscilocalization_la_includedir = $(includedir)/localization
+libscilocalization_la_includedir = $(sciincludedir)/localization
 libscilocalization_la_include_HEADERS = includes/localization.h
 
 #SUFFIXES = .xml .sci .htm
@@ -288,6 +286,9 @@ DOCMASK = *.htm
 pkgmacrosdir = $(target)
 MACROSDIRS = macros/
 MACROSMASK = *.sci
+
+# Where headers (*.h) are installed (usually /usr/include/scilab/)
+sciincludedir = ${includedir}/scilab
 all: all-am
 
 .SUFFIXES: