forked from enlightenment/enlightenment
remove ferite from the makefiles, so people who _do_ have the right version of
ferite installed dont get error. ;) Sorry bowis, but I blame you for this. SVN revision: 6158
This commit is contained in:
parent
4ce3a83807
commit
b439fa0bb0
32
configure.ac
32
configure.ac
|
@ -181,38 +181,6 @@ AC_PATH_GENERIC(ebg,, [
|
||||||
ebg_libs=`ebg-config --libs`
|
ebg_libs=`ebg-config --libs`
|
||||||
ebg_cflags=`ebg-config --cflags`
|
ebg_cflags=`ebg-config --cflags`
|
||||||
|
|
||||||
dnl Check for ferite.
|
|
||||||
AC_ARG_WITH(ferite,
|
|
||||||
[ --with-ferite=DIR use ferite in <DIR>],
|
|
||||||
[CFLAGS="$CFLAGS -I$withval/include"
|
|
||||||
LIBS="-L$withval/lib $LIBS"])
|
|
||||||
|
|
||||||
AC_PATH_GENERIC(ferite,, [
|
|
||||||
AC_SUBST(ferite_libs)
|
|
||||||
AC_SUBST(ferite_cflags)
|
|
||||||
AC_DEFINE(USE_FERITE)
|
|
||||||
ferite_libs=`ferite-config --libs`
|
|
||||||
ferite_cflags=`ferite-config --cflags`
|
|
||||||
AC_PATH_PROG(FEBUILDER, builder,,)
|
|
||||||
AC_SUBST(FEBUILDER)
|
|
||||||
ferite=yes],[
|
|
||||||
echo "Not building ferite support"
|
|
||||||
ferite=no])
|
|
||||||
|
|
||||||
AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes")
|
|
||||||
|
|
||||||
AC_SUBST(CP_OPTIONS)
|
|
||||||
|
|
||||||
if test "x$ferite" = "xyes"; then
|
|
||||||
save_dir=`pwd`
|
|
||||||
cd $packagesrcdir/src
|
|
||||||
echo -n "... building ferite binding c code ... ";
|
|
||||||
rm -f e_ferite_gen_*;
|
|
||||||
$FEBUILDER -m e_ferite_gen -i e_ferite_register -d -c e_ferite.fec;
|
|
||||||
echo "done.";
|
|
||||||
cd $save_dir
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFLAGS=$imlib2_cflags
|
CFLAGS=$imlib2_cflags
|
||||||
LIBS=$imlib2_libs
|
LIBS=$imlib2_libs
|
||||||
dnl Check for db loader.
|
dnl Check for db loader.
|
||||||
|
|
32
configure.in
32
configure.in
|
@ -180,38 +180,6 @@ AC_PATH_GENERIC(ebg,, [
|
||||||
ebg_libs=`ebg-config --libs`
|
ebg_libs=`ebg-config --libs`
|
||||||
ebg_cflags=`ebg-config --cflags`
|
ebg_cflags=`ebg-config --cflags`
|
||||||
|
|
||||||
dnl Check for ferite.
|
|
||||||
AC_ARG_WITH(ferite,
|
|
||||||
[ --with-ferite=DIR use ferite in <DIR>],
|
|
||||||
[CFLAGS="$CFLAGS -I$withval/include"
|
|
||||||
LIBS="-L$withval/lib $LIBS"])
|
|
||||||
|
|
||||||
AC_PATH_GENERIC(ferite,, [
|
|
||||||
AC_SUBST(ferite_libs)
|
|
||||||
AC_SUBST(ferite_cflags)
|
|
||||||
AC_DEFINE(USE_FERITE)
|
|
||||||
ferite_libs=`ferite-config --libs`
|
|
||||||
ferite_cflags=`ferite-config --cflags`
|
|
||||||
AC_PATH_PROG(FEBUILDER, builder,,)
|
|
||||||
AC_SUBST(FEBUILDER)
|
|
||||||
ferite=yes],[
|
|
||||||
echo "Not building ferite support"
|
|
||||||
ferite=no])
|
|
||||||
|
|
||||||
AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes")
|
|
||||||
|
|
||||||
AC_SUBST(CP_OPTIONS)
|
|
||||||
|
|
||||||
if test "x$ferite" = "xyes"; then
|
|
||||||
save_dir=`pwd`
|
|
||||||
cd $packagesrcdir/src
|
|
||||||
echo -n "... building ferite binding c code ... ";
|
|
||||||
rm -f e_ferite_gen_*;
|
|
||||||
$FEBUILDER -m e_ferite_gen -i e_ferite_register -d -c e_ferite.fec;
|
|
||||||
echo "done.";
|
|
||||||
cd $save_dir
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFLAGS=$imlib2_cflags
|
CFLAGS=$imlib2_cflags
|
||||||
LIBS=$imlib2_libs
|
LIBS=$imlib2_libs
|
||||||
dnl Check for db loader.
|
dnl Check for db loader.
|
||||||
|
|
24
po/ChangeLog
24
po/ChangeLog
|
@ -1,3 +1,27 @@
|
||||||
|
2002-04-21 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
||||||
|
2002-04-21 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
||||||
|
2002-03-21 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
||||||
|
2002-03-21 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
||||||
|
2002-03-21 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
||||||
|
2002-03-21 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
||||||
2002-03-10 gettextize <bug-gnu-utils@gnu.org>
|
2002-03-10 gettextize <bug-gnu-utils@gnu.org>
|
||||||
|
|
||||||
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
DISTCLEANFILES = e_ferite_gen_*
|
|
||||||
|
|
||||||
## Enable -DDEBUG for debugging messages, -DDEBUG_NEST
|
## Enable -DDEBUG for debugging messages, -DDEBUG_NEST
|
||||||
## for call tracing. Caution -- this will produce a *lot*
|
## for call tracing. Caution -- this will produce a *lot*
|
||||||
## of output!
|
## of output!
|
||||||
|
@ -9,35 +7,9 @@ DEBUGFLAGS = -W -Wall -g -DDEBUG #-DDEBUG_NEST
|
||||||
|
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
-I$(top_srcdir)/intl \
|
-I$(top_srcdir)/intl \
|
||||||
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ @ferite_cflags@ $(DEBUGFLAGS)
|
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ $(DEBUGFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = e_ferite.fec
|
bin_PROGRAMS = enlightenment
|
||||||
|
|
||||||
if USE_FERITE
|
|
||||||
ferite_c = e_ferite_gen_core.c \
|
|
||||||
e_ferite_gen_header.h \
|
|
||||||
e_ferite_gen_e.c \
|
|
||||||
e_ferite_gen_Border.c \
|
|
||||||
e_ferite.h e_ferite.c
|
|
||||||
|
|
||||||
BUILT_SOURCES = e_ferite_gen_core.c \
|
|
||||||
e_ferite_gen_header.h \
|
|
||||||
e_ferite_gen_e.c \
|
|
||||||
e_ferite_gen_Border.c
|
|
||||||
|
|
||||||
# Yes, blank because we don't want it to supply
|
|
||||||
# it's own build rule.
|
|
||||||
e_ferite_gen_e_c_SOURCES =
|
|
||||||
|
|
||||||
e_ferite_gen_e.c: e_ferite.fec
|
|
||||||
rm -f e_ferite_gen_*
|
|
||||||
$(FEBUILDER) -m e_ferite_gen -i e_ferite_register -d -c e_ferite.fec
|
|
||||||
|
|
||||||
E_FERITE_GEN_E_C = e_ferite_gen_e.c
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
bin_PROGRAMS = enlightenment $(E_FERITE_GEN_E_C)
|
|
||||||
|
|
||||||
enlightenment_SOURCES = \
|
enlightenment_SOURCES = \
|
||||||
actions.h actions.c \
|
actions.h actions.c \
|
||||||
|
@ -55,7 +27,6 @@ enlightenment_SOURCES = \
|
||||||
focus.h focus.c \
|
focus.h focus.c \
|
||||||
file.h file.c \
|
file.h file.c \
|
||||||
fs.h fs.c \
|
fs.h fs.c \
|
||||||
$(ferite_c) \
|
|
||||||
guides.h guides.c \
|
guides.h guides.c \
|
||||||
globals.h globals.c \
|
globals.h globals.c \
|
||||||
icccm.h icccm.c \
|
icccm.h icccm.c \
|
||||||
|
@ -84,4 +55,4 @@ enlightenment_SOURCES = \
|
||||||
e_view_look.h e_view_look.c \
|
e_view_look.h e_view_look.c \
|
||||||
e.h
|
e.h
|
||||||
|
|
||||||
enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ @ferite_libs@ -lm -lc $(INTLLIBS)
|
enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ -lm -lc $(INTLLIBS)
|
||||||
|
|
|
@ -2,21 +2,21 @@
|
||||||
|
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
-I$(top_srcdir)/intl \
|
-I$(top_srcdir)/intl \
|
||||||
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ @ferite_cflags@
|
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@
|
||||||
|
|
||||||
bin_PROGRAMS = e_img_import e_img_export e_setup
|
bin_PROGRAMS = e_img_import e_img_export e_setup
|
||||||
|
|
||||||
e_img_import_SOURCES = \
|
e_img_import_SOURCES = \
|
||||||
e_img_import.c
|
e_img_import.c
|
||||||
|
|
||||||
e_img_import_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ferite_libs@ -lm $(INTLLIBS)
|
e_img_import_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm $(INTLLIBS)
|
||||||
|
|
||||||
e_img_export_SOURCES = \
|
e_img_export_SOURCES = \
|
||||||
e_img_export.c
|
e_img_export.c
|
||||||
|
|
||||||
e_img_export_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ferite_libs@ -lm $(INTLLIBS)
|
e_img_export_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ -lm $(INTLLIBS)
|
||||||
|
|
||||||
e_setup_SOURCES = \
|
e_setup_SOURCES = \
|
||||||
e_setup.c
|
e_setup.c
|
||||||
|
|
||||||
e_setup_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ebg_libs@ @ferite_libs@ -lm $(INTLLIBS)
|
e_setup_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @ebg_libs@ -lm $(INTLLIBS)
|
||||||
|
|
Loading…
Reference in New Issue