Thu May 1 18:55:28 CEST 2003
(Kim) Make auto* stop whining. Removed obsolete po/Makefile.in.in. SVN revision: 6888
This commit is contained in:
parent
55d60b7116
commit
abe01cc801
|
|
@ -20,3 +20,5 @@ cat-id-tbl.c
|
|||
enlightenment.pot
|
||||
enlightenment*.tar.gz
|
||||
ABOUT-NLS
|
||||
m4
|
||||
autom4te*.cache
|
||||
|
|
|
|||
|
|
@ -1822,3 +1822,11 @@ Sun Apr 27 18:29:09 CEST 2003
|
|||
(Kim)
|
||||
|
||||
Fix (de-)iconify problem related to EWMH changes.
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Thu May 1 18:55:28 CEST 2003
|
||||
(Kim)
|
||||
|
||||
Make auto* stop whining.
|
||||
Removed obsolete po/Makefile.in.in.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ sample-scripts/shade-pagers.pl \
|
|||
e.spec \
|
||||
configure \
|
||||
configure.in \
|
||||
econfig.h.in \
|
||||
config.h.in \
|
||||
ABOUT-NLS \
|
||||
AUTHORS \
|
||||
COPYING \
|
||||
|
|
|
|||
39
acconfig.h
39
acconfig.h
|
|
@ -1,39 +0,0 @@
|
|||
#undef ENLIGHTENMENT_VERSION
|
||||
|
||||
#undef HAVE_STDARGS
|
||||
|
||||
#undef HAVE_LIBESD
|
||||
|
||||
#undef HAVE_SM
|
||||
|
||||
#undef ENLIGHTENMENT_MAJOR
|
||||
|
||||
#undef ENLIGHTENMENT_MINOR
|
||||
|
||||
#undef ENLIGHTENMENT_MICRO
|
||||
|
||||
#undef AUTOUPGRADE
|
||||
|
||||
#undef WITH_TARTY_WARP
|
||||
|
||||
#undef WITH_ZOOM
|
||||
|
||||
#undef ENABLE_NLS
|
||||
|
||||
#undef HAVE_CATGETS
|
||||
|
||||
#undef HAVE_GETTEXT
|
||||
|
||||
#undef HAVE_LC_MESSAGES
|
||||
|
||||
#undef HAVE_STPCPY
|
||||
|
||||
#undef PACKAGE
|
||||
|
||||
#undef HAS_XINERAMA
|
||||
|
||||
#undef VERSION
|
||||
|
||||
#undef ENABLE_EWMH
|
||||
#undef ENABLE_GNOME
|
||||
#undef ENABLE_KDE
|
||||
46
configure.in
46
configure.in
|
|
@ -5,10 +5,7 @@ ENLIGHTENMENT_MINOR=16
|
|||
ENLIGHTENMENT_MICRO=6
|
||||
ENLIGHTENMENT_VERSION=$ENLIGHTENMENT_MAJOR.$ENLIGHTENMENT_MINOR.$ENLIGHTENMENT_MICRO
|
||||
|
||||
VERSION=$ENLIGHTENMENT_VERSION
|
||||
PACKAGE=enlightenment
|
||||
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
|
||||
AM_INIT_AUTOMAKE(enlightenment, $ENLIGHTENMENT_VERSION)
|
||||
AM_MAINTAINER_MODE
|
||||
AM_CONDITIONAL(FSSTD, test x$enable_fsstd = xyes)
|
||||
AC_SUBST(USE_FSSTD)
|
||||
|
|
@ -20,26 +17,21 @@ else
|
|||
prefix=$prefix
|
||||
fi
|
||||
|
||||
AM_CONFIG_HEADER(econfig.h)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_VERSION, "$ENLIGHTENMENT_VERSION")
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_VERSION, "$ENLIGHTENMENT_VERSION", [Enlightenment version])
|
||||
AC_SUBST(ENLIGHTENMENT_VERSION)
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MAJOR, "$ENLIGHTENMENT_MAJOR")
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MAJOR, "$ENLIGHTENMENT_MAJOR", [Major Version])
|
||||
AC_SUBST(ENLIGHTENMENT_MAJOR)
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MINOR, "$ENLIGHTENMENT_MINOR")
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MINOR, "$ENLIGHTENMENT_MINOR", [Minor Version])
|
||||
AC_SUBST(ENLIGHTENMENT_MINOR)
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO")
|
||||
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro Version])
|
||||
AC_SUBST(ENLIGHTENMENT_MICRO)
|
||||
|
||||
AC_SUBST(ENLIGHTENMENT_ROOT)
|
||||
AC_SUBST(ENLIGHTENMENT_BIN)
|
||||
AC_SUBST(LOCALEDIR)
|
||||
|
||||
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
|
||||
AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
|
||||
|
||||
AC_PROG_CC
|
||||
|
|
@ -53,9 +45,8 @@ AC_HEADER_STDC
|
|||
AC_PATH_X
|
||||
AC_PATH_XTRA
|
||||
|
||||
AC_CHECK_HEADER(stdarg.h, AC_DEFINE(HAVE_STDARGS))
|
||||
AC_CHECK_HEADER(X11/SM/SMlib.h, AC_DEFINE(HAVE_SM))
|
||||
AC_CHECK_HEADERS(alloca.h wctype.h)
|
||||
AC_CHECK_HEADERS(X11/SM/SMlib.h)
|
||||
AC_CHECK_HEADERS(alloca.h stdarg.h wctype.h)
|
||||
|
||||
AC_TYPE_SIGNAL
|
||||
|
||||
|
|
@ -87,9 +78,9 @@ AC_ARG_ENABLE(hints-gnome,
|
|||
AC_ARG_ENABLE(hints-kde,
|
||||
[ --enable-hints-kde compile with KDE(<3.0) hints support [default=no]],, enable_hints_kde=no)
|
||||
|
||||
if test "x$enable_hints_ewmh" = "xyes"; then AC_DEFINE(ENABLE_EWMH) fi
|
||||
if test "x$enable_hints_gnome" = "xyes"; then AC_DEFINE(ENABLE_GNOME) fi
|
||||
if test "x$enable_hints_kde" = "xyes"; then AC_DEFINE(ENABLE_KDE) fi
|
||||
if test "x$enable_hints_ewmh" = "xyes"; then AC_DEFINE(ENABLE_EWMH, 1, [Extended Window Manager Hints]) fi
|
||||
if test "x$enable_hints_gnome" = "xyes"; then AC_DEFINE(ENABLE_GNOME, 1, [GNOME(<2.0) Hints]) fi
|
||||
if test "x$enable_hints_kde" = "xyes"; then AC_DEFINE(ENABLE_KDE, 1, [KDE(<3.0) Hints]) fi
|
||||
AM_CONDITIONAL(ENABLE_EWMH, test "x$enable_hints_ewmh" = "xyes")
|
||||
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnome" = "xyes")
|
||||
AM_CONDITIONAL(ENABLE_KDE, test "x$enable_hints_kde" = "xyes")
|
||||
|
|
@ -110,7 +101,7 @@ else
|
|||
fi
|
||||
|
||||
if test "x$enable_sound" = "xyes"; then
|
||||
AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD),[
|
||||
AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD, 1, [libesd.so]),[
|
||||
echo "WARNING: Enlightenment needs a system with libesd.so (EsounD)"
|
||||
echo "0.2.17 or higher to use sound support."
|
||||
echo "Enlightenment can use EsounD (ESD) to be installed to compile."
|
||||
|
|
@ -151,7 +142,7 @@ AC_MSG_ERROR([Fatal Error: no Fnlib detected.])], $IMLIB_LIBS)
|
|||
AC_SUBST(FNLIB_LIBS)
|
||||
|
||||
if test "x$enable_upgrade" = "xyes"; then
|
||||
AC_CHECK_LIB(ghttp, ghttp_uri_validate, [AC_DEFINE(AUTOUPGRADE)
|
||||
AC_CHECK_LIB(ghttp, ghttp_uri_validate, [AC_DEFINE(AUTOUPGRADE, 1, [Automatic upgrading])
|
||||
GHTTP_LIBS=-lghttp] , [
|
||||
echo "Automatic Upgrades requires libghttp"
|
||||
AC_MSG_WARN([no libghttp detected.])
|
||||
|
|
@ -184,8 +175,8 @@ AC_SUBST(DL_LIBS)
|
|||
AC_CHECK_LIB(Xtst, XTestGrabControl, , , $X_LIBS)
|
||||
AC_CHECK_LIB(Xtst, XTestQueryExtension, XTST_LIBS=-lXtst, , $X_LIBS)
|
||||
AC_SUBST(XTST_LIBS)
|
||||
AC_CHECK_LIB(Xext, XkbQueryExtension, AC_DEFINE(WITH_TARTY_WARP), , $X_LIBS)
|
||||
AC_CHECK_LIB(Xinerama, XineramaQueryExtension, AC_DEFINE(HAS_XINERAMA)
|
||||
AC_CHECK_LIB(Xext, XkbQueryExtension, AC_DEFINE(WITH_TARTY_WARP, 1, [Tarty Warp]), , $X_LIBS)
|
||||
AC_CHECK_LIB(Xinerama, XineramaQueryExtension, AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
|
||||
XINERAMA_LIBS=-lXinerama
|
||||
, ,$X_LIBS)
|
||||
|
||||
|
|
@ -193,7 +184,7 @@ AC_ARG_ENABLE(zoom, [ --enable-zoom compile with zoom support [defaul
|
|||
|
||||
if test "x$enable_zoom" = "xyes"; then
|
||||
AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
|
||||
AC_DEFINE(WITH_ZOOM)
|
||||
AC_DEFINE(WITH_ZOOM, 1, [Zoom Support])
|
||||
XVM_LIBS=-lXxf86vm
|
||||
, , $X_LIBS)
|
||||
else
|
||||
|
|
@ -203,8 +194,6 @@ fi
|
|||
AC_SUBST(XVM_LIBS)
|
||||
AC_SUBST(XINERAMA_LIBS)
|
||||
AC_SUBST(XKB)
|
||||
AC_SUBST(ENLIGHTENMENT_ROOT)
|
||||
AC_SUBST(ENLIGHTENMENT_BIN)
|
||||
|
||||
AC_CHECK_LIB(Fridge,mass_quantities_of_bass_ale)
|
||||
AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale, , [
|
||||
|
|
@ -237,7 +226,4 @@ scripts/enlightenment.install
|
|||
po/Makefile.in
|
||||
intl/Makefile
|
||||
debian/Makefile
|
||||
],
|
||||
[
|
||||
cp econfig.h config.h
|
||||
])
|
||||
|
|
|
|||
|
|
@ -2,16 +2,6 @@ SUBDIRS=E-docs
|
|||
|
||||
EXTRA_DIST = ChangeLog README
|
||||
|
||||
if FSSTD
|
||||
bindir = @bindir@
|
||||
ENLIGHTENMENT_BIN=$(bindir)
|
||||
ENLIGHTENMENT_ROOT=$(pkgdatadir)
|
||||
else
|
||||
ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
|
||||
ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
|
||||
bindir=$(ENLIGHTENMENT_BIN)
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = dox
|
||||
|
||||
dox_SOURCES = \
|
||||
|
|
@ -35,15 +25,6 @@ INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I/usr/include/fre
|
|||
|
||||
DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"
|
||||
|
||||
#install-exec-local:
|
||||
# if [ x@USE_FSSTD@ = "xno" ]; then \
|
||||
# ../mkinstalldirs $(exec_prefix)/bin; \
|
||||
# for i in $(bin_PROGRAMS); do \
|
||||
# rm -f $(exec_prefix)/bin/$$i; \
|
||||
# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
|
||||
# done; \
|
||||
# fi
|
||||
|
||||
uninstall-local:
|
||||
for i in $(bin_PROGRAMS); do \
|
||||
rm -f $(exec_prefix)/bin/$$i; \
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#include "econfig.h"
|
||||
#include "dox.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
|
@ -43,10 +42,6 @@
|
|||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "econfig.h"
|
||||
|
||||
#include "dox.h"
|
||||
|
||||
#if defined(__alpha__) && defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 96)) /* gets rid of some misalignment in GCC */
|
||||
#pragma 2
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "econfig.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: The Enlightenment window manager.
|
||||
Name: enlightenment
|
||||
Version: 0.16.6
|
||||
Release: 0.9
|
||||
Release: 0.10
|
||||
Copyright: BSD
|
||||
Group: User Interface/Desktops
|
||||
Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
|
||||
|
|
|
|||
2
e.spec
2
e.spec
|
|
@ -1,7 +1,7 @@
|
|||
Summary: The Enlightenment window manager.
|
||||
Name: enlightenment
|
||||
Version: 0.16.6
|
||||
Release: 0.9
|
||||
Release: 0.10
|
||||
Copyright: BSD
|
||||
Group: User Interface/Desktops
|
||||
Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
|
||||
|
|
|
|||
4
eesh/E.h
4
eesh/E.h
|
|
@ -24,7 +24,7 @@
|
|||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
* */
|
||||
|
||||
#include "econfig.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
|
@ -48,8 +48,6 @@
|
|||
#include <sys/ipc.h>
|
||||
#include <sys/shm.h>
|
||||
|
||||
#include "econfig.h"
|
||||
|
||||
#ifndef ENLIGHTENMENT_ROOT
|
||||
#define ENLIGHTENMENT_ROOT "/usr/local/enlightenment"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,10 +1,3 @@
|
|||
if FSSTD
|
||||
bindir = @bindir@
|
||||
ENLIGHTENMENT_ROOT=$(pkglibdir)
|
||||
else
|
||||
bindir=$(prefix)/enlightenment/bin
|
||||
ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = eesh
|
||||
|
||||
|
|
@ -25,15 +18,6 @@ INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
|
|||
|
||||
DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
|
||||
|
||||
#install-exec-local:
|
||||
# if [ x@USE_FSSTD@ = "xno" ]; then \
|
||||
# ../mkinstalldirs $(exec_prefix)/bin; \
|
||||
# for i in $(bin_PROGRAMS); do \
|
||||
# rm -f $(exec_prefix)/bin/$$i; \
|
||||
# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
|
||||
# done; \
|
||||
# fi
|
||||
|
||||
uninstall-local:
|
||||
for i in $(bin_PROGRAMS); do \
|
||||
rm -f $(exec_prefix)/bin/$$i; \
|
||||
|
|
|
|||
|
|
@ -17,12 +17,6 @@
|
|||
#along with GNU CC; see the file COPYING. If not, write to
|
||||
#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
if FSSTD
|
||||
bindir = @bindir@
|
||||
else
|
||||
bindir=$(prefix)/enlightenment/bin
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = epp
|
||||
|
||||
epp_SOURCES = \
|
||||
|
|
@ -60,15 +54,6 @@ DEFS= \
|
|||
|
||||
LIBS =
|
||||
|
||||
#install-exec-local:
|
||||
# if [ x@USE_FSSTD@ = "xno" ]; then \
|
||||
# ../mkinstalldirs $(exec_prefix)/bin; \
|
||||
# for i in $(bin_PROGRAMS); do \
|
||||
# rm -f $(exec_prefix)/bin/$$i; \
|
||||
# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
|
||||
# done; \
|
||||
# fi
|
||||
|
||||
uninstall-local:
|
||||
for i in $(bin_PROGRAMS); do \
|
||||
rm -f $(exec_prefix)/bin/$$i; \
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
char *version_string = "0.0.0";
|
||||
|
||||
#include "econfig.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifdef __EMX__
|
||||
#include <strings.h>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
.icons
|
||||
Makefile
|
||||
Makefile.in
|
||||
Makefile.in.in
|
||||
.deps
|
||||
.libs
|
||||
stamp-*
|
||||
|
|
|
|||
|
|
@ -1,317 +0,0 @@
|
|||
# Makefile for PO directory in any package using GNU gettext.
|
||||
# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
||||
#
|
||||
# This file can be copied and used freely without restrictions. It can
|
||||
# be used in projects which are not available under the GNU General Public
|
||||
# License but which still want to provide support for the GNU gettext
|
||||
# functionality.
|
||||
# Please note that the actual code of GNU gettext is covered by the GNU
|
||||
# General Public License and is *not* in the public domain.
|
||||
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
|
||||
SHELL = /bin/sh
|
||||
@SET_MAKE@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datadir = @datadir@
|
||||
localedir = $(datadir)/locale
|
||||
gettextsrcdir = $(datadir)/gettext/po
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
|
||||
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGFMT = @MSGFMT@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
MSGMERGE = msgmerge
|
||||
MSGMERGE_UPDATE = @MSGMERGE@ --update
|
||||
MSGINIT = msginit
|
||||
MSGCONV = msgconv
|
||||
MSGFILTER = msgfilter
|
||||
|
||||
POFILES = @POFILES@
|
||||
GMOFILES = @GMOFILES@
|
||||
UPDATEPOFILES = @UPDATEPOFILES@
|
||||
DUMMYPOFILES = @DUMMYPOFILES@
|
||||
DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
|
||||
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
|
||||
DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
|
||||
$(POFILES) $(GMOFILES) \
|
||||
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
|
||||
|
||||
POTFILES = \
|
||||
|
||||
CATALOGS = @CATALOGS@
|
||||
|
||||
# Makevars gets inserted here. (Don't remove this line!)
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
|
||||
|
||||
.po.mo:
|
||||
@echo "$(MSGFMT) -c -o $@ $<"; \
|
||||
$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
|
||||
|
||||
.po.gmo:
|
||||
@lang=`echo $* | sed -e 's,.*/,,'`; \
|
||||
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||
echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
|
||||
cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
|
||||
|
||||
.sin.sed:
|
||||
sed -e '/^#/d' $< > t-$@
|
||||
mv t-$@ $@
|
||||
|
||||
|
||||
all: all-@USE_NLS@
|
||||
|
||||
all-yes: $(CATALOGS)
|
||||
all-no:
|
||||
|
||||
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
|
||||
# otherwise packages like GCC can not be built if only parts of the source
|
||||
# have been downloaded.
|
||||
|
||||
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
||||
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
|
||||
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
|
||||
--files-from=$(srcdir)/POTFILES.in \
|
||||
--copyright-holder='$(COPYRIGHT_HOLDER)'
|
||||
test ! -f $(DOMAIN).po || { \
|
||||
if test -f $(srcdir)/$(DOMAIN).pot; then \
|
||||
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
|
||||
sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
|
||||
if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
|
||||
rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
|
||||
else \
|
||||
rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
|
||||
mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
|
||||
fi; \
|
||||
else \
|
||||
mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
|
||||
fi; \
|
||||
}
|
||||
|
||||
$(srcdir)/$(DOMAIN).pot:
|
||||
$(MAKE) $(DOMAIN).pot-update
|
||||
|
||||
$(POFILES): $(srcdir)/$(DOMAIN).pot
|
||||
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
|
||||
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||
echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
|
||||
cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
|
||||
|
||||
|
||||
install: install-exec install-data
|
||||
install-exec:
|
||||
install-data: install-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext"; then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
for file in $(DISTFILES.common); do \
|
||||
$(INSTALL_DATA) $(srcdir)/$$file \
|
||||
$(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
done; \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
install-data-no: all
|
||||
install-data-yes: all
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
$(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
|
||||
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
|
||||
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
|
||||
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
||||
if test -n "$$lc"; then \
|
||||
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|
||||
link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
|
||||
mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
||||
mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
||||
(cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
|
||||
for file in *; do \
|
||||
if test -f $$file; then \
|
||||
ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
|
||||
fi; \
|
||||
done); \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
||||
else \
|
||||
if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
|
||||
:; \
|
||||
else \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
||||
mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
||||
fi; \
|
||||
fi; \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
|
||||
ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
|
||||
ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
|
||||
cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
|
||||
echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
|
||||
fi; \
|
||||
done; \
|
||||
done
|
||||
|
||||
install-strip: install
|
||||
|
||||
installdirs: installdirs-exec installdirs-data
|
||||
installdirs-exec:
|
||||
installdirs-data: installdirs-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext"; then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
installdirs-data-no:
|
||||
installdirs-data-yes:
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
$(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
||||
if test -n "$$lc"; then \
|
||||
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|
||||
link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
|
||||
mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
||||
mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
||||
(cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
|
||||
for file in *; do \
|
||||
if test -f $$file; then \
|
||||
ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
|
||||
fi; \
|
||||
done); \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
||||
else \
|
||||
if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
|
||||
:; \
|
||||
else \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
||||
mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi; \
|
||||
done; \
|
||||
done
|
||||
|
||||
# Define this as empty until I found a useful application.
|
||||
installcheck:
|
||||
|
||||
uninstall: uninstall-exec uninstall-data
|
||||
uninstall-exec:
|
||||
uninstall-data: uninstall-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext"; then \
|
||||
for file in $(DISTFILES.common); do \
|
||||
rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
done; \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
uninstall-data-no:
|
||||
uninstall-data-yes:
|
||||
catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
|
||||
done; \
|
||||
done
|
||||
|
||||
check: all
|
||||
|
||||
dvi info tags TAGS ID:
|
||||
|
||||
mostlyclean:
|
||||
rm -f remove-potcdate.sed
|
||||
rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
|
||||
rm -fr *.o
|
||||
|
||||
clean: mostlyclean
|
||||
|
||||
distclean: clean
|
||||
rm -f Makefile Makefile.in POTFILES *.mo
|
||||
|
||||
maintainer-clean: distclean
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
rm -f $(GMOFILES)
|
||||
|
||||
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
||||
dist distdir:
|
||||
$(MAKE) update-po
|
||||
@$(MAKE) dist2
|
||||
# This is a separate target because 'update-po' must be executed before.
|
||||
dist2: $(DISTFILES)
|
||||
dists="$(DISTFILES)"; \
|
||||
if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
|
||||
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
|
||||
for file in $$dists; do \
|
||||
if test -f $$file; then \
|
||||
cp -p $$file $(distdir); \
|
||||
else \
|
||||
cp -p $(srcdir)/$$file $(distdir); \
|
||||
fi; \
|
||||
done
|
||||
|
||||
update-po: Makefile
|
||||
$(MAKE) $(DOMAIN).pot-update
|
||||
$(MAKE) $(UPDATEPOFILES)
|
||||
$(MAKE) update-gmo
|
||||
|
||||
# General rule for updating PO files.
|
||||
|
||||
.nop.po-update:
|
||||
@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
|
||||
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
|
||||
tmpdir=`pwd`; \
|
||||
echo "$$lang:"; \
|
||||
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||
echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
|
||||
cd $(srcdir); \
|
||||
if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
|
||||
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
||||
rm -f $$tmpdir/$$lang.new.po; \
|
||||
else \
|
||||
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
|
||||
:; \
|
||||
else \
|
||||
echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi; \
|
||||
else \
|
||||
echo "msgmerge for $$lang.po failed!" 1>&2; \
|
||||
rm -f $$tmpdir/$$lang.new.po; \
|
||||
fi
|
||||
|
||||
$(DUMMYPOFILES):
|
||||
|
||||
update-gmo: Makefile $(GMOFILES)
|
||||
@:
|
||||
|
||||
Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
||||
$(SHELL) ./config.status
|
||||
|
||||
force:
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make not to export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
|
@ -1,17 +1,3 @@
|
|||
if FSSTD
|
||||
ENLIGHTENMENT_BIN=@bindir@
|
||||
ENLIGHTENMENT_ROOT=$(pkgdatadir)
|
||||
escriptsdatadir = @bindir@
|
||||
else
|
||||
escriptsdatadir = $(prefix)/enlightenment/bin
|
||||
ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
|
||||
ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
|
||||
endif
|
||||
|
||||
escriptsdata_DATA =
|
||||
escriptsdata_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu \
|
||||
e_cache_clean e_cache_query enlightenment.install e_gen_menu.pl \
|
||||
e_cache_clean.pl e_cache_query.pl
|
||||
|
||||
EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
|
||||
e_cache_query enlightenment.install.in e_gen_menu.pl \
|
||||
|
|
@ -20,12 +6,3 @@ EXTRA_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
|
|||
e_cache_query enlightenment.install e_gen_menu.pl \
|
||||
e_cache_clean.pl e_cache_query.pl
|
||||
|
||||
#if FSSTD
|
||||
#
|
||||
#else
|
||||
#install-exec-hook:
|
||||
# rm -f @bindir@/enlightenment.install; \
|
||||
# $(LN_S) \
|
||||
# $(DESTDIR)$(escriptsdatadir)/enlightenment.install \
|
||||
# /enlightenment.install
|
||||
#endif
|
||||
|
|
|
|||
5
src/E.h
5
src/E.h
|
|
@ -24,7 +24,7 @@
|
|||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "econfig.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
|
@ -91,7 +91,6 @@ if (__xim) XDestroyImage(__xim);}
|
|||
#else
|
||||
#include <freetype.h>
|
||||
#endif
|
||||
#include "econfig.h"
|
||||
|
||||
/* workaround for 64bit architectures - xlib expects 32bit CARDINALS to be */
|
||||
/* long's on 64bit machines... thus well the CARD32's Im unsing shoudl be.. */
|
||||
|
|
@ -237,7 +236,7 @@ extern char *call_stack[1024];
|
|||
int Evsnprintf(char *str, size_t count, const char *fmt,
|
||||
va_list args);
|
||||
|
||||
#ifdef HAVE_STDARGS
|
||||
#ifdef HAVE_STDARG_H
|
||||
int Esnprintf(char *str, size_t count, const char *fmt, ...);
|
||||
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -2,17 +2,6 @@ SUBDIRS = themes
|
|||
|
||||
EXTRA_DIST = README ChangeLog TODO ewmh.c gnome.c kde.c
|
||||
|
||||
if FSSTD
|
||||
bindir=@bindir@
|
||||
ENLIGHTENMENT_BIN=@bindir@
|
||||
ENLIGHTENMENT_ROOT=$(pkgdatadir)
|
||||
else
|
||||
ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
|
||||
ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
|
||||
bindir=$(ENLIGHTENMENT_BIN)
|
||||
endif
|
||||
|
||||
|
||||
bin_PROGRAMS = enlightenment
|
||||
|
||||
if ENABLE_EWMH
|
||||
|
|
@ -119,15 +108,6 @@ INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I..
|
|||
|
||||
DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\"
|
||||
|
||||
#install-exec-local:
|
||||
# if [ x@USE_FSSTD@ = "xno" ]; then \
|
||||
# ../mkinstalldirs $(exec_prefix)/bin; \
|
||||
# for i in $(bin_PROGRAMS); do \
|
||||
# rm -f $(exec_prefix)/bin/$$i; \
|
||||
# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
|
||||
# done; \
|
||||
# fi
|
||||
|
||||
install-data-local:
|
||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes; \
|
||||
rm -f $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT; \
|
||||
|
|
|
|||
2
src/ecvs
2
src/ecvs
|
|
@ -99,7 +99,7 @@ if(($ARGV[0] =~ /com/) || ($ARGV[0] =~ /ci/)) {
|
|||
}
|
||||
}
|
||||
|
||||
push @ARGV, "\timestamp.h" if(!$found);
|
||||
push @ARGV, "src/timestamp.h" if(!$found);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -454,7 +454,7 @@ autosave(void)
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef HAVE_SM
|
||||
#ifndef HAVE_X11_SM_SMLIB_H
|
||||
static void LogoutCB(int val, void *data);
|
||||
|
||||
void
|
||||
|
|
@ -697,7 +697,7 @@ doSMExit(void *params)
|
|||
AUDIO_PLAY("SOUND_EXIT");
|
||||
EExit(0);
|
||||
}
|
||||
#else /* HAVE_SM */
|
||||
#else /* HAVE_X11_SM_SMLIB_H */
|
||||
#include <X11/SM/SMlib.h>
|
||||
|
||||
static char *sm_client_id = NULL;
|
||||
|
|
@ -1395,4 +1395,4 @@ doSMExit(void *params)
|
|||
EExit(0);
|
||||
}
|
||||
|
||||
#endif /* HAVE_SM */
|
||||
#endif /* HAVE_X11_SM_SMLIB_H */
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ Evsnprintf(char *str, size_t count, const char *fmt, va_list args)
|
|||
return (strlen(str));
|
||||
}
|
||||
|
||||
#ifdef HAVE_STDARGS
|
||||
#ifdef HAVE_STDARG_H
|
||||
int
|
||||
Esnprintf(char *str, size_t count, const char *fmt, ...)
|
||||
#else
|
||||
|
|
@ -90,7 +90,7 @@ Esnprintf(va_alist)
|
|||
va_dcl
|
||||
#endif
|
||||
{
|
||||
#ifndef HAVE_STDARGS
|
||||
#ifndef HAVE_STDARG_H
|
||||
char *str;
|
||||
size_t count;
|
||||
char *fmt;
|
||||
|
|
|
|||
Loading…
Reference in New Issue