e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid unnecessary library dependencies in eesh and edox. Cleanups. 

SVN revision: 25668
This commit is contained in:
Kim Woelders 2006-09-09 22:21:48 +00:00
parent 43ed797a82
commit 870989a27e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -134,7 +134,7 @@ IMLIB_LIBS=`imlib2-config --libs`
IMLIB_CFLAGS=`imlib2-config --cflags` IMLIB_CFLAGS=`imlib2-config --cflags`
AC_SUBST(IMLIB_LIBS) AC_SUBST(IMLIB_LIBS)
AC_SUBST(IMLIB_CFLAGS) AC_SUBST(IMLIB_CFLAGS)
AC_CHECK_LIB(Imlib2, imlib_create_image,, AC_CHECK_LIB(Imlib2, imlib_create_image, dummy=1,
AC_MSG_ERROR([Cannot find Imlib2: Is imlib2-config in path?]), AC_MSG_ERROR([Cannot find Imlib2: Is imlib2-config in path?]),
$IMLIB_LIBS) $IMLIB_LIBS)
@ -165,11 +165,12 @@ AC_ARG_ENABLE(xinerama,
if test "x$enable_xinerama" = "xyes"; then if test "x$enable_xinerama" = "xyes"; then
AC_CHECK_LIB(Xinerama, XineramaQueryExtension, AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support]) AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
E_X_LIBS="-lXinerama $E_X_LIBS", XINERAMA_LIBS="-lXinerama",
enable_xinerama=no enable_xinerama=no
AC_MSG_WARN([Xinerama support was requested but not found]), AC_MSG_WARN([Xinerama support was requested but not found]),
$X_LIBS -lXext -lX11) $X_LIBS -lXext -lX11)
fi fi
AC_SUBST(XINERAMA_LIBS)
AC_ARG_ENABLE(zoom, AC_ARG_ENABLE(zoom,
[ --enable-zoom compile with zoom support @<:@default=yes@:>@],, [ --enable-zoom compile with zoom support @<:@default=yes@:>@],,

4
dox/Makefile.am
View File

@ -6,9 +6,9 @@ bin_PROGRAMS = edox
edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
LDADD = $(IMLIB_LIBS) $(X_LIBS) $(E_X_LIBS) -lX11 -lm LDADD = $(IMLIB_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(IMLIB_CFLAGS) $(X_CFLAGS) INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(IMLIB_CFLAGS) $(X_CFLAGS)
uninstall-local: uninstall-local:
for i in $(bin_PROGRAMS); do \ for i in $(bin_PROGRAMS); do \

2
eesh/Makefile.am
View File

@ -5,7 +5,7 @@ eesh_SOURCES = E.h comms.c main.c
LDADD = $(X_LIBS) -lX11 LDADD = $(X_LIBS) -lX11
INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(X_CFLAGS) INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(X_CFLAGS)
uninstall-local: uninstall-local:
for i in $(bin_PROGRAMS); do \ for i in $(bin_PROGRAMS); do \

4
epp/Makefile.am
View File

@ -30,7 +30,7 @@ epp_SOURCES = \
cpplib.c \ cpplib.c \
cppmain.c cppmain.c
INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I$(includedir) INCLUDES = -I$(top_builddir) -I$(top_srcdir)
DEFS= \ DEFS= \
-DHAVE_STRERROR \ -DHAVE_STRERROR \
@ -51,8 +51,6 @@ DEFS= \
-DTARGET_TAB=9 \ -DTARGET_TAB=9 \
-DTARGET_VT=11 -DTARGET_VT=11
LIBS =
uninstall-local: uninstall-local:
for i in $(bin_PROGRAMS); do \ for i in $(bin_PROGRAMS); do \
rm -f $(exec_prefix)/bin/$$i; \ rm -f $(exec_prefix)/bin/$$i; \

1
src/Makefile.am
View File

@ -145,6 +145,7 @@ LDADD = \
$(IMLIB_LIBS) \ $(IMLIB_LIBS) \
$(X_PRE_LIBS) \ $(X_PRE_LIBS) \
$(X_LIBS) \ $(X_LIBS) \
$(XINERAMA_LIBS) \
$(X_EXTRA_LIBS) \ $(X_EXTRA_LIBS) \
$(E_X_LIBS) \ $(E_X_LIBS) \
-lX11 -lm -lX11 -lm