ftp://ftp.uniovi.es/pub/X11R6/graphics/misc/lock/xscreensaver-1.22.tar.gz

[xscreensaver] / Imakefile

diff --git a/Imakefile b/Imakefile
index 174f63f7d708fd6bf76d36033feecbb26516a1b0..0377de1fc7ffa3548ea328090558dc06df4872c1 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -1,5 +1,5 @@
 /*
- * Imakefile file for xscreensaver, Copyright (c) 1991-1993 Jamie Zawinski.
+ * Imakefile file for xscreensaver, Copyright (c) 1991-1994 Jamie Zawinski.
  *
  * You should not need to edit this file; edit config.h instead.
  *
@@ -11,8 +11,8 @@
             TAR = gnutar
        COMPRESS = compress
    COMPRESS_EXT = Z
-#      COMPRESS = gzip --verbose --best
-#  COMPRESS_EXT = gz
+/**/#      COMPRESS = gzip --verbose --best
+/**/#  COMPRESS_EXT = gz
 
 all:: utils/Makefile driver/Makefile hacks/Makefile
        cd utils  ; $(MAKE) $@ CC="$(CC)" CCOPTIONS="$(CCOPTIONS)" CDEBUGFLAGS="$(CDEBUGFLAGS)"
@@ -33,16 +33,21 @@ driver/Makefile: driver/Imakefile config.h
 hacks/Makefile: hacks/Imakefile config.h
        cd hacks  ; $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)/hacks
 
-# This really makes me sick...
+/* This really makes me sick... */
 tar: utils/Makefile driver/Makefile hacks/Makefile
        @NAME=`sed -n                                                       \
   's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
   rm -f $$NAME ; ln -s . $$NAME ;                                          \
+  FILES= ;                                                                 \
+  for subdir in driver utils hacks ; do                                            \
+    cd $$subdir ;                                                          \
+    FILES="$$FILES `make echo_tarfiles                                     \
+      | grep -v '^make\['                                                  \
+      | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\"                           \
+      ` ";                                                                 \
+    cd .. ; done ;                                                         \
   echo creating tar file $${NAME}.tar.$(COMPRESS_EXT)... ;                 \
-   $(TAR) -vchf - `echo $(TARFILES)                                        \
-   \`cd driver ; make echo_tarfiles | sed 's|^|driver/|g;s| | driver/|g'\`  \
-   \`cd utils  ; make echo_tarfiles | sed 's|^|utils/|g; s| | utils/|g'\`   \
-   \`cd hacks  ; make echo_tarfiles | sed 's|^|hacks/|g; s| | hacks/|g'\`   \
-   | sed "s|^|$$NAME/|g; s| | $$NAME/|g" `                                 \
+  $(TAR) -vchf -                                                           \
+    `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" `      \
    | $(COMPRESS) > $${NAME}.tar.$(COMPRESS_EXT) ;                          \
   rm $$NAME