Make EROOT and EBIN available to all epplets.
SVN revision: 818
This commit is contained in:
parent
df793d4b3d
commit
278d66d3ad
|
@ -270,6 +270,10 @@
|
||||||
/* Define if lex declares yytext as a char * by default, not a char[]. */
|
/* Define if lex declares yytext as a char * by default, not a char[]. */
|
||||||
#undef YYTEXT_POINTER
|
#undef YYTEXT_POINTER
|
||||||
|
|
||||||
|
/* Enlightenment paths */
|
||||||
|
#undef EROOT
|
||||||
|
#undef EBIN
|
||||||
|
|
||||||
|
|
||||||
/* Leave that blank line there!! Autoheader needs it.
|
/* Leave that blank line there!! Autoheader needs it.
|
||||||
If you're adding to this file, keep in mind:
|
If you're adding to this file, keep in mind:
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libepplet.la
|
lib_LTLIBRARIES = libepplet.la
|
||||||
|
|
||||||
|
include_HEADERS = epplet.h
|
||||||
libepplet_la_SOURCES = epplet.c
|
libepplet_la_SOURCES = epplet.c
|
||||||
libepplet_la_DEPENDENCIES = $(top_builddir)/config.h
|
libepplet_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
libepplet_la_LDFLAGS = -version-info 1:0:1
|
libepplet_la_LDFLAGS = -version-info 1:0:1
|
||||||
|
|
|
@ -25,6 +25,9 @@
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#define EROOT "@EROOT@"
|
||||||
|
#define EBIN "@EBIN@"
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* Data structures & primitives */
|
/* Data structures & primitives */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
14
configure.in
14
configure.in
|
@ -1,6 +1,6 @@
|
||||||
dnl# $Id$
|
dnl# $Id$
|
||||||
|
|
||||||
AC_INIT(api/epplet.h)
|
AC_INIT(api/epplet.c)
|
||||||
AM_INIT_AUTOMAKE(Epplets, 0.1)
|
AM_INIT_AUTOMAKE(Epplets, 0.1)
|
||||||
|
|
||||||
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
|
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
|
||||||
|
@ -191,6 +191,8 @@ else
|
||||||
AC_MSG_RESULT(warning: EBIN environment variable not detected. Using $EBIN)
|
AC_MSG_RESULT(warning: EBIN environment variable not detected. Using $EBIN)
|
||||||
AC_SUBST(EBIN)
|
AC_SUBST(EBIN)
|
||||||
fi
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED(EROOT, "$EROOT")
|
||||||
|
AC_DEFINE_UNQUOTED(EBIN, "$EBIN")
|
||||||
|
|
||||||
CFLAGS=${CFLAGS--O}
|
CFLAGS=${CFLAGS--O}
|
||||||
LDFLAGS=${LDFLAGS--O}
|
LDFLAGS=${LDFLAGS--O}
|
||||||
|
@ -210,4 +212,14 @@ AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_OUTPUT(Makefile api/Makefile epplets/Makefile)
|
AC_OUTPUT(Makefile api/Makefile epplets/Makefile)
|
||||||
|
|
||||||
|
echo "creating api/epplet.h"
|
||||||
|
sed -e "s%@EROOT@%$EROOT%g" -e "s%@EBIN@%$EBIN%g" 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
|
||||||
|
|
||||||
echo "Now type 'make' to build $PACKAGE $VERSION."
|
echo "Now type 'make' to build $PACKAGE $VERSION."
|
||||||
|
|
|
@ -31,7 +31,8 @@ EXTRA_DIST = E-Load.icon E-Clock.icon E-Net.icon E-Cpu.icon EppletTest.icon \
|
||||||
E-Clock-Image.png
|
E-Clock-Image.png
|
||||||
|
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
$(mkinstalldirs) $(EROOT)/epplet_icons;
|
$(mkinstalldirs) $(EROOT)/epplet_icons
|
||||||
for i in $(srcdir)/*.icon $(srcdir)/*.png; do \
|
@for i in $(srcdir)/*.icon ; do \
|
||||||
|
echo $(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \
|
||||||
$(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \
|
$(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue