projects
/
m17n
/
m17n-lib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright years
[m17n/m17n-lib.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
4f5f550
..
563de14
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012
# National Institute of Advanced Industrial Science and Technology (AIST)
# Registration Number H15PRO112
# National Institute of Advanced Industrial Science and Technology (AIST)
# Registration Number H15PRO112
@@
-23,7
+23,7
@@
VINFO = -version-info @API_VERSION@
BASICBUILDS = libm17n-core.la libm17n.la libm17n-flt.la
if WITH_GUI
BASICBUILDS = libm17n-core.la libm17n.la libm17n-flt.la
if WITH_GUI
-BUILD_LIBS = $(BASICBUILDS) libm17n-gui.la libm17n-X.la libm17n-gd.la
+BUILD_LIBS = $(BASICBUILDS) libm17n-gui.la
else
BUILD_LIBS = $(BASICBUILDS)
endif
else
BUILD_LIBS = $(BASICBUILDS)
endif
@@
-57,6
+57,7
@@
libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
FLT_SOURCES = \
libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
FLT_SOURCES = \
+ internal-flt.h \
m17n-flt.h m17n-flt.c
libm17n_flt_la_SOURCES = ${FLT_SOURCES}
m17n-flt.h m17n-flt.c
libm17n_flt_la_SOURCES = ${FLT_SOURCES}
@@
-79,21
+80,26
@@
OPTIONAL_LD_FLAGS = \
@FONTCONFIG_LD_FLAGS@
libm17n_gui_la_SOURCES = ${GUI_SOURCES}
@FONTCONFIG_LD_FLAGS@
libm17n_gui_la_SOURCES = ${GUI_SOURCES}
-libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n.la
+libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la
libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
+if WITH_GUI
+
+moduledir = ${libdir}/@M17N_MODULE_DIR@
+module_LTLIBRARIES = libm17n-X.la libm17n-gd.la
X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
-libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la
-libm17n_X_la_LDFLAGS = -module ${VINFO}
+libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ @FONTCONFIG_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
+libm17n_X_la_LDFLAGS = -avoid-version -module
libm17n_gd_la_SOURCES = m17n-gd.c
libm17n_gd_la_SOURCES = m17n-gd.c
-libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la
-libm17n_gd_la_LDFLAGS = -module ${VINFO}
+libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
+libm17n_gd_la_LDFLAGS = -avoid-version -module
-AM_CPPFLAGS = -DM17NDIR=\"@M17NDIR@\" -DGETTEXTDIR=\"@GETTEXTDIR@\"
+endif
+AM_CPPFLAGS = -DM17NDIR=\"@M17NDIR@\" -DM17N_MODULE_DIR=\"${libdir}/@M17N_MODULE_DIR@\" -DGETTEXTDIR=\"@GETTEXTDIR@\"
BASICHEADERS = m17n-core.h m17n.h m17n-misc.h m17n-flt.h
if WITH_GUI
BASICHEADERS = m17n-core.h m17n.h m17n-misc.h m17n-flt.h
if WITH_GUI