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

Fri Nov 19 12:35:48 PST 1999 

(KainX)

Okay, all the conditional build stuff should be fixed up now.  I'll need some
SGI people to test this as well as Solaris people, since it's entirely
possible I borked them both. :-)


SVN revision: 1336
This commit is contained in:
Michael Jennings 1999-11-19 18:46:24 +00:00
parent 50a526a8ad
commit cfe314b476
7 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -664,3 +664,11 @@ Changes to E-NetGraph.c
Removed some warnings which show up when compiling with -Wall.
-------------------------------------------------------------------------------
Fri Nov 19 12:35:48 PST 1999
(KainX)
Okay, all the conditional build stuff should be fixed up now. I'll need some
SGI people to test this as well as Solaris people, since it's entirely
possible I borked them both. :-)

19
configure.in
View File

@ -248,14 +248,22 @@ AC_CHECK_HEADERS(linux/soundcard.h,[P_MIXER=mixer],[
AC_CHECK_HEADERS(machine/soundcard.h, [P_MIXER=mixer],[
AC_CHECK_HEADERS(dmedia/audio.h, [P_MIXER=mixer],[
AC_CHECK_HEADERS(sys/soundcard.h, [P_MIXER=mixer]) ]) ]) ])
AM_CONDITIONAL(EPPLET_MIXER, test "$P_MIXER" = "mixer")
if test "$P_MIXER" != "mixer"; then
AC_MSG_WARN([*** \`E-Mixer' applet will not be built ***])
if test "$P_MIXER" = "mixer"; then
MIXER_PROGS="E-Mixer.epplet Emix.epplet"
else
AC_MSG_WARN([*** Mixer epplets will not be built ***])
MIXER_PROGS=""
fi
SGI=
AC_CHECK_HEADERS(dmedia/audio.h,[SGI=sgi])
AM_CONDITIONAL(SGI_AUDIO, test "$SGI" = "sgi")
if test "$SGI" = "sgi"; then
SGI_LIBS="-laudio"
SGI_DEFINES="-DSGI_AUDIO"
else
SGI_LIBS=""
SGI_DEFINES=""
fi
CFLAGS=${CFLAGS--O}
LDFLAGS=${LDFLAGS--O}
@ -270,6 +278,9 @@ AC_SUBST(LIBS)
AC_SUBST(GTLIBS)
AC_SUBST(THREADLIBS)
AC_SUBST(TEST_PROGS)
AC_SUBST(MIXER_PROGS)
AC_SUBST(SGI_LIBS)
AC_SUBST(SGI_DEFINES)
basedir=.

3
epplets/E-Cpu.c
View File

@ -4,7 +4,8 @@
#include <signal.h>
#include <sys/wait.h>
#include <errno.h>
#include <epplet.h>
#include "config.h"
#include "epplet.h"
#ifdef HAVE_LIBGTOP
#include <glibtop.h>

1
epplets/E-Load.c
View File

@ -1,3 +1,4 @@
#include "config.h"
#include "epplet.h"
#ifdef HAVE_LIBGTOP

1
epplets/E-MemWatch.c
View File

@ -4,6 +4,7 @@
#include <signal.h>
#include <sys/wait.h>
#include <errno.h>
#include "config.h"
#include "epplet.h"
#ifdef HAVE_LIBGTOP

1
epplets/E-Sys.c
View File

@ -4,6 +4,7 @@
#include <signal.h>
#include <sys/wait.h>
#include <errno.h>
#include "config.h"
#include "epplet.h"
#ifdef HAVE_LIBGTOP

67
epplets/Makefile.am
View File

@ -2,42 +2,46 @@
bindir = $(EBIN)
if EPPLET_MIXER
E_Mixer_prog = E-Mixer.epplet
E_Mixer_sources = E-Mixer.c
E_Mixer_depend = $(top_srcdir)/api/libepplet.la
if SGI_AUDIO
E_Mixer_ldflags = -rpath $(libdir):$(pkglibdir) -laudio
E_Mixer_defines = -DSGI_AUDIO
else
E_Mixer_ldflags = -rpath $(libdir):$(pkglibdir)
endif
endif
bin_PROGRAMS = E-Load.epplet E-Clock.epplet E-Time.epplet E-Net.epplet \
E-Cpu.epplet E-Biff.epplet E-Power.epplet Emix.epplet @TEST_PROGS@ \
E-Cpu.epplet E-Biff.epplet E-Power.epplet @TEST_PROGS@ @MIXER_PROGS@ \
E-MemWatch.epplet E-Disk.epplet E-Areas.epplet \
E-NetFlame.epplet E-Sys.epplet E-ScreenShoot.epplet E-Slides.epplet \
E-Xss.epplet E-Mountbox.epplet E-Exec.epplet $(E_Mixer_prog) E-SD.epplet \
E-Xss.epplet E-Mountbox.epplet E-Exec.epplet E-SD.epplet \
E-ScreenSave.epplet E-NetGraph.epplet
EXTRA_PROGRAMS = EppletTest.epplet EppletConfigTest.epplet
EXTRA_PROGRAMS = EppletTest.epplet EppletConfigTest.epplet E-Mixer.epplet Emix.epplet
################ Conditional Builds ################
E_Mixer_epplet_SOURCES = E-Mixer.c
E_Mixer_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Mixer_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Mixer_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) @SGI_LIBS@
Emix_epplet_SOURCES = Emix.c
Emix_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
EppletTest_epplet_SOURCES = TestEpplet.c
EppletTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
EppletConfigTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
####################################################
E_Exec_epplet_SOURCES = E-Exec.c
E_Exec_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Mixer_epplet_SOURCES = $(E_Mixer_sources)
E_Mixer_epplet_DEPENDENCIES = $(E_Mixer_depend)
E_Mixer_epplet_LDFLAGS = $(E_Mixer_ldflags)
E_SD_epplet_SOURCES = E-SD.c E-SD.h esdcloak.c utils.c utils.h esdcloak.h
E_SD_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
E_Load_epplet_SOURCES = E-Load.c
E_Load_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Load_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Load_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
E_Clock_epplet_SOURCES = E-Clock.c
E_Clock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -61,27 +65,21 @@ E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Cpu_epplet_SOURCES = E-Cpu.c
E_Cpu_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Cpu_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Cpu_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
E_Power_epplet_SOURCES = E-Power.c
E_Power_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Power_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
EppletTest_epplet_SOURCES = TestEpplet.c
EppletTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
EppletConfigTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Biff_epplet_SOURCES = E-Biff.c mbox.c
E_Biff_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_MemWatch_epplet_SOURCES = E-MemWatch.c
E_MemWatch_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_MemWatch_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_MemWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
E_Disk_epplet_SOURCES = E-Disk.c
E_Disk_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -89,7 +87,8 @@ E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Sys_epplet_SOURCES = E-Sys.c
E_Sys_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Sys_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Sys_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
E_Slides_epplet_SOURCES = E-Slides.c
E_Slides_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -99,10 +98,6 @@ E_Xss_epplet_SOURCES = E-Xss.c
E_Xss_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
Emix_epplet_SOURCES = Emix.c
Emix_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_ScreenShoot_epplet_SOURCES = \
E-ScreenShoot.c E-ScreenShoot.h cloak.c utils.c utils.h cloak.h
E_ScreenShoot_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -125,7 +120,7 @@ E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
E_Mountbox_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
INCLUDES = -I. -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) $(E_Mixer_defines)
INCLUDES = -I. -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) @SGI_DEFINES@
LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
ABOUT_DOCS = \