e16
/
e16-epplets
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tue Jul 29 22:20:38 EDT 2003 

(KainX)

Applied patch from Kim Woelders <kim@woelders.dk> for various build fixes.


SVN revision: 7259
This commit is contained in:
Michael Jennings 2003-07-30 02:21:17 +00:00
parent 369fe70aff
commit 85d07c8a4a
6 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2279,3 +2279,10 @@ Sun Apr 6 22:37:50 EDT 2003
Applied patch from Kim Woelders <kim@woelders.dk> to support new WM hints.
-------------------------------------------------------------------------------
Tue Jul 29 22:20:38 EDT 2003
(KainX)
Applied patch from Kim Woelders <kim@woelders.dk> for various build fixes.
-------------------------------------------------------------------------------

4
acconfig.h
View File

@ -279,10 +279,6 @@
/* Define if lex declares yytext as a char * by default, not a char[]. */
#undef YYTEXT_POINTER
/* Enlightenment paths */
#undef EROOT
#undef EBIN
/* Do we need libgtop? */
#undef HAVE_LIBGTOP

7
api/Makefile.am
View File

@ -7,13 +7,8 @@ libepplet_la_SOURCES = epplet.c snprintf.c
libepplet_la_DEPENDENCIES = $(top_builddir)/config.h epplet.h
libepplet_la_LDFLAGS = -version-info 1:0:1
INCLUDES = -I. -I$(top_srcdir) -I.. -I$(includedir) \
-I$(prefix)/include $(X_CFLAGS)
INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
LDADD = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
EXTRA_DIST = epplet.h.in
epplet.h: epplet.h.in
sed -e "s%@""EROOT@%@EROOT@%g" -e "s%@""EBIN@%@EBIN@%g" \
$(srcdir)/epplet.h.in > $(srcdir)/epplet.h

33
configure.in
View File

@ -117,9 +117,9 @@ dnl* I hope I'm doing this right
dnl#
AC_CHECK_LIB(GL, glXChooseVisual, GL_LIBS="GL", , $X_LIBS $SUBLIBS)
if test "$GL_LIBS" = "GL"; then
AC_CHECK_LIB(GLU, main, , GL_LIBS="", $X_LIBS $SUBLIBS)
fi
#if test "$GL_LIBS" = "GL"; then
# AC_CHECK_LIB(GLU, main, , GL_LIBS="", $X_LIBS $SUBLIBS)
#fi
GL_PROGS=""
@ -227,6 +227,13 @@ else
GTLIBS=""
fi
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
fi
if test "x$exec_prefix" = "xNONE"; then
exec_prefix=$prefix
fi
# Build test programs?
AC_ARG_WITH(test-programs, [ --with-test-programs Builds the test programs [default=no]],
TEST_PROGS="EppletTest.epplet EppletConfigTest.epplet",TEST_PROGS="")
@ -275,7 +282,7 @@ then
AC_SUBST(EROOT)
AC_MSG_RESULT($EROOT)
else
EROOT=$ENLIGHTENMENT_ROOT
EROOT=`eval echo $ENLIGHTENMENT_ROOT`
AC_MSG_RESULT(warning: EROOT environment variable not detected. Using $EROOT)
AC_SUBST(EROOT)
fi
@ -288,14 +295,10 @@ then
AC_SUBST(EBIN)
AC_MSG_RESULT($EBIN)
else
EBIN=$ENLIGHTENMENT_BIN
EBIN=`eval echo $ENLIGHTENMENT_BIN`
AC_MSG_RESULT(warning: EBIN environment variable not detected. Using $EBIN)
AC_SUBST(EBIN)
fi
AC_DEFINE_UNQUOTED(EROOT, "$EROOT")
AC_DEFINE_UNQUOTED(EBIN, "$EBIN")
AC_SUBST(EROOT)
AC_SUBST(EBIN)
# Should we install E-Mixer?
# Probably not ;-) But we may as well check!
@ -361,17 +364,7 @@ basedir=.
AM_CONFIG_HEADER(config.h)
AC_OUTPUT(Makefile api/Makefile epplets/Makefile debian/Makefile)
echo "creating api/epplet.h"
sed -e "s%@EROOT@%$EROOT%g" -e "s%@EBIN@%$EBIN%g" -e "s%\${exec_prefix}%${exec_prefix}%g" -e "s%\${prefix}%${prefix}%g" ${srcdir}/api/epplet.h.in > api/epplet.h.new
if (diff api/epplet.h.new api/epplet.h >/dev/null 2>&1); then
echo "api/epplet.h unchanged."
rm -f api/epplet.h.new
else
rm -f api/epplet.h
mv api/epplet.h.new api/epplet.h
fi
AC_OUTPUT(Makefile api/Makefile epplets/Makefile debian/Makefile api/epplet.h)
echo
echo "If you are running Enlightenment < 0.16.4, you *must* configure"

2
epplets.spec
View File

@ -3,7 +3,7 @@
Summary: Enlightenment Epplets
Name: epplets
Version: 0.7
Release: 0.3
Release: 0.4
Copyright: BSD
Group: User Interface/X
URL: http://www.enlightenment.org

14
epplets/Makefile.am
View File

@ -158,10 +158,6 @@ E_GtkRc_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_GtkRc_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
E_GtkRc_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
E_Areas_epplet_SOURCES = E-Areas.c
E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
@ -301,19 +297,21 @@ install-data-hook:
done
$(INSTALL_DATA) $(srcdir)/$(BG_SRC) $(DESTDIR)$(edatadir)/epplet_data/
$(INSTALL_DATA) $(srcdir)/$(FONT_SRC) $(DESTDIR)$(edatadir)/epplet_data/
@cd $(DESTDIR)$(edatadir)/epplet_data/ ; \
for i in $(NEED_BG) ; do \
@for i in $(NEED_BG) ; do \
about_dir="$(DESTDIR)$(edatadir)/epplet_data/$$i/$${i}.ABOUT" ; \
echo "test -d $$about_dir || $(mkinstalldirs) $$about_dir" ; \
test -d $$about_dir || $(mkinstalldirs) $$about_dir ; \
echo "test -f $$about_dir/$(BG_SRC) || ln -sf ../../$(BG_SRC) $$about_dir || :" ; \
test -f $$about_dir/$(BG_SRC) || ln -sf ../../$(BG_SRC) $$about_dir || : ; \
done
@cd $(DESTDIR)$(edatadir)/epplet_data/ ; \
for i in $(NEED_FONT) ; do \
@for i in $(NEED_FONT) ; do \
about_dir="$(DESTDIR)$(edatadir)/epplet_data/$$i/$${i}.ABOUT" ; \
echo "test -d $$about_dir || $(mkinstalldirs) $$about_dir" ; \
test -d $$about_dir || $(mkinstalldirs) $$about_dir ; \
echo "test -f $$about_dir/$(FONT_SRC) || ln -sf ../../$(FONT_SRC) $$about_dir || :" ; \
test -f $$about_dir/$(FONT_SRC) || ln -sf ../../$(FONT_SRC) $$about_dir || : ; \
done
uninstall-local:
$(RM) $(DESTDIR)$(edatadir)/epplet_data/$(BG_SRC)
$(RM) $(DESTDIR)$(edatadir)/epplet_data/$(FONT_SRC)