[PATCH app-rstart 10/15] config: let the samples directory handle the samples
Gaetan Nadon
memsize at videotron.ca
Thu Jan 27 12:58:46 PST 2011
In this case, simply distribute the samples, no installation
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
Makefile.am | 43 ++++++++-----------------------------------
configure.ac | 3 ++-
samples/Makefile.am | 25 +++++++++++++++++++++++++
3 files changed, 35 insertions(+), 36 deletions(-)
create mode 100644 samples/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index ce8db02..72bd47d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = man commands contexts
+SUBDIRS = man commands contexts samples
# rstartd server
@@ -61,42 +61,15 @@ EXTRA_DIST = rstart.in rstartd.in config.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = rstart rstartd config
-EXTRA_DIST += \
- server.os2 \
- \
- samples/commands/openwindows2/Terminal \
- samples/commands/openwindows2/LoadMonitor \
- samples/commands/openwindows2/@List \
- samples/commands/ListContexts \
- samples/commands/x11r5/Terminal \
- samples/commands/x11r5/LoadMonitor \
- samples/commands/x11r5/@List \
- samples/commands/odt1/Terminal \
- samples/commands/odt1/LoadMonitor \
- samples/commands/odt1/@List \
- samples/commands/@List \
- samples/commands/ListGenericCommands \
- samples/commands/openwindows3/Terminal \
- samples/commands/openwindows3/LoadMonitor \
- samples/commands/openwindows3/@List \
- samples/contexts.odt1/openwindows2 \
- samples/contexts.odt1/default \
- samples/contexts.odt1/@Aliases \
- samples/contexts.odt1/x11r5 \
- samples/contexts.odt1/odt1 \
- samples/contexts.odt1/x11r6 \
- samples/contexts.odt1/@List \
- samples/contexts.odt1/openwindows3 \
- \
- specs/fix.awk \
- specs/fix.nawk \
- specs/fix.sed \
- specs/rstart.ms \
- specs/rstartd.txt \
+EXTRA_DIST += \
+ server.os2 \
+ specs/fix.awk \
+ specs/fix.nawk \
+ specs/fix.sed \
+ specs/rstart.ms \
+ specs/rstartd.txt \
specs/tmac.rfc
-
-
.PHONY: ChangeLog INSTALL
INSTALL:
diff --git a/configure.ac b/configure.ac
index bac4fbc..6773947 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,5 +63,6 @@ AC_CONFIG_FILES([
Makefile
man/Makefile
commands/Makefile
- contexts/Makefile])
+ contexts/Makefile
+ samples/Makefile])
AC_OUTPUT
diff --git a/samples/Makefile.am b/samples/Makefile.am
new file mode 100644
index 0000000..565dc8f
--- /dev/null
+++ b/samples/Makefile.am
@@ -0,0 +1,25 @@
+
+dist_noinst_DATA = \
+ commands/openwindows2/Terminal \
+ commands/openwindows2/LoadMonitor \
+ commands/openwindows2/@List \
+ commands/ListContexts \
+ commands/x11r5/Terminal \
+ commands/x11r5/LoadMonitor \
+ commands/x11r5/@List \
+ commands/odt1/Terminal \
+ commands/odt1/LoadMonitor \
+ commands/odt1/@List \
+ commands/@List \
+ commands/ListGenericCommands \
+ commands/openwindows3/Terminal \
+ commands/openwindows3/LoadMonitor \
+ commands/openwindows3/@List \
+ contexts.odt1/openwindows2 \
+ contexts.odt1/default \
+ contexts.odt1/@Aliases \
+ contexts.odt1/x11r5 \
+ contexts.odt1/odt1 \
+ contexts.odt1/x11r6 \
+ contexts.odt1/@List \
+ contexts.odt1/openwindows3
--
1.6.0.4
More information about the xorg-devel
mailing list