Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets/epplets
Modified Files:
Makefile.am
Log Message:
New AC_INIT, autofoo cleanups. Bump version.
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/Makefile.am,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- Makefile.am 18 Mar 2007 04:49:48 -0000 1.98
+++ Makefile.am 11 Nov 2007 17:51:14 -0000 1.99
@@ -1,6 +1,6 @@
-# $Id: Makefile.am,v 1.98 2007/03/18 04:49:48 kwo Exp $
+# $Id: Makefile.am,v 1.99 2007/11/11 17:51:14 kwo Exp $
-edatadir = $(EROOT)
+edatadir = $(datadir)/e16
bin_PROGRAMS = E-Load.epplet E-Clock.epplet E-Time.epplet E-Net.epplet \
E-Cpu.epplet E-Biff.epplet E-Power.epplet \
@@ -16,160 +16,161 @@
Emix.epplet E-PlayCD.epplet E-OpenGL-Demo.epplet \
E-SD.epplet
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/api $(IMLIB2_CFLAGS) $(X_CFLAGS)
@SGI_DEFINES@
-LDADD = $(top_builddir)/api/libepplet.la $(IMLIB2_LIBS) $(GLX_LIBS) $(X_LIBS)
$(KSTAT_LIBS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/api $(IMLIB2_CFLAGS) $(X_CFLAGS)
+LDADD = $(top_builddir)/api/libepplet.la $(X_LIBS) $(KSTAT_LIBS)
################ Conditional Builds ################
E_Mixer_epplet_SOURCES = E-Mixer.c
+E_Mixer_epplet_CPPFLAGS = $(INCLUDES) @SGI_DEFINES@
E_Mixer_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Mixer_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Mixer_epplet_LDFLAGS = -rpath $(libdir)
E_Mixer_epplet_LDADD = $(LDADD) @SGI_LIBS@
Emix_epplet_SOURCES = Emix.c
Emix_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+Emix_epplet_LDFLAGS = -rpath $(libdir)
E_PlayCD_epplet_SOURCES = E-PlayCD.c
E_PlayCD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_PlayCD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_PlayCD_epplet_LDFLAGS = -rpath $(libdir)
E_PlayCD_epplet_LDADD = $(LDADD) -lcdaudio
EppletTest_epplet_SOURCES = TestEpplet.c
EppletTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+EppletTest_epplet_LDFLAGS = -rpath $(libdir)
EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
EppletConfigTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir)
E_OpenGL_Demo_epplet_SOURCES = E-OpenGL-Demo.c
E_OpenGL_Demo_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_OpenGL_Demo_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_OpenGL_Demo_epplet_LDFLAGS = -rpath $(libdir)
####################################################
E_Exec_epplet_SOURCES = E-Exec.c
E_Exec_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Exec_epplet_LDFLAGS = -rpath $(libdir)
E_SD_epplet_SOURCES = E-SD.c esdcloak.c utils.c utils.h esdcloak.h
E_SD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
+E_SD_epplet_LDFLAGS = -rpath $(libdir) -lesd
E_Load_epplet_SOURCES = E-Load.c
E_Load_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Load_epplet_LDFLAGS = -rpath $(libdir)
E_Load_epplet_LDADD = $(LDADD) $(GTLIBS)
E_LoadMeter_epplet_SOURCES = E-LoadMeter.c load.c
E_LoadMeter_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_LoadMeter_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_LoadMeter_epplet_LDFLAGS = -rpath $(libdir)
E_LoadMeter_epplet_LDADD = $(LDADD) $(GTLIBS)
E_Clock_epplet_SOURCES = E-Clock.c
E_Clock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Clock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Clock_epplet_LDFLAGS = -rpath $(libdir)
E_MoonClock_epplet_SOURCES = E-MoonClock.c CalcEphem.c CalcEphem.h Moon.c
E_MoonClock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_MoonClock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_MoonClock_epplet_LDFLAGS = -rpath $(libdir)
E_Time_epplet_SOURCES = E-Time.c
E_Time_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Time_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Time_epplet_LDFLAGS = -rpath $(libdir)
E_Magic_epplet_SOURCES = E-Magic.c
E_Magic_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Magic_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Magic_epplet_LDFLAGS = -rpath $(libdir)
E_Toolbox_epplet_SOURCES = E-Toolbox.c
E_Toolbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Toolbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Toolbox_epplet_LDFLAGS = -rpath $(libdir)
E_Areas_epplet_SOURCES = E-Areas.c
E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Areas_epplet_LDFLAGS = -rpath $(libdir)
E_Bandwidth_epplet_SOURCES = E-Bandwidth.c net.c net.h
E_Bandwidth_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Bandwidth_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Bandwidth_epplet_LDFLAGS = -rpath $(libdir)
E_Net_epplet_SOURCES = E-Net.c net.c net.h
E_Net_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Net_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Net_epplet_LDFLAGS = -rpath $(libdir)
E_NetFlame_epplet_SOURCES = E-NetFlame.c net.c net.h
E_NetFlame_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_NetFlame_epplet_LDFLAGS = -rpath $(libdir)
E_Wireless_epplet_SOURCES = E-Wireless.c
E_Wireless_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Wireless_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Wireless_epplet_LDFLAGS = -rpath $(libdir)
E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
E_Cpu_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Cpu_epplet_LDFLAGS = -rpath $(libdir)
E_Cpu_epplet_LDADD = $(LDADD) $(GTLIBS)
E_Power_epplet_SOURCES = E-Power.c
E_Power_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Power_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Power_epplet_LDFLAGS = -rpath $(libdir)
E_Biff_epplet_SOURCES = E-Biff.c mbox.c
E_Biff_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Biff_epplet_LDFLAGS = -rpath $(libdir)
E_MemWatch_epplet_SOURCES = E-MemWatch.c
E_MemWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_MemWatch_epplet_LDFLAGS = -rpath $(libdir)
E_MemWatch_epplet_LDADD = $(LDADD) $(GTLIBS)
E_Disk_epplet_SOURCES = E-Disk.c
E_Disk_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Disk_epplet_LDFLAGS = -rpath $(libdir)
E_Sys_epplet_SOURCES = E-Sys.c
E_Sys_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Sys_epplet_LDFLAGS = -rpath $(libdir)
E_Sys_epplet_LDADD = $(LDADD) $(GTLIBS)
E_Slides_epplet_SOURCES = E-Slides.c
E_Slides_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Slides_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Slides_epplet_LDFLAGS = -rpath $(libdir)
E_Xss_epplet_SOURCES = E-Xss.c
E_Xss_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Xss_epplet_LDFLAGS = -rpath $(libdir)
E_ScreenShoot_epplet_SOURCES = \
E-ScreenShoot.c cloak.c utils.c utils.h cloak.h \
E-ScreenShoot_ftp.c E-ScreenShoot_ftp.h
E_ScreenShoot_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir)
E_NetGraph_epplet_SOURCES = E-NetGraph.c net.c net.h
E_NetGraph_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_NetGraph_epplet_LDFLAGS = -rpath $(libdir)
E_ScreenSave_epplet_SOURCES = \
E-ScreenSave.c cloak.c utils.c utils.h cloak.h
E_ScreenSave_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir)
E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
E_UrlWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir)
E_Mountbox_epplet_SOURCES = E-Mountbox.c
E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Mountbox_epplet_LDFLAGS = -rpath $(libdir)
E_Pinger_epplet_SOURCES = E-Pinger.c
E_Pinger_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Pinger_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Pinger_epplet_LDFLAGS = -rpath $(libdir)
E_Pants_epplet_SOURCES = E-Pants.c
E_Pants_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Pants_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Pants_epplet_LDFLAGS = -rpath $(libdir)
# You can use the following command to generate this line:
# ABOUT_DOCS = `(cd epplets && ls -1d *.ABOUT/* 2>/dev/null | grep -v CVS)`
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
