Merge pull request #19 from olebole/Makefiles

Replace Imakefiles by Makefiles

.travis.yml

@@ -31,11 +31,10 @@ git:
   depth: 3
 
 before_script:
-  - xmkmf -a
   - make
 
 script:
   - test -x xgterm/xgterm
   - test -x ximtool/ximtool
-  - test -x bin/ism_wcspix.e
+  - test -x ximtool/clients/ism_wcspix.e
   - xvfb-run xgterm/xgterm -e sleep 1

Makefile

@@ -0,0 +1,25 @@
+all: xgterm ximtool xtapemon obmsh
+
+.PHONY: xgterm ximtool xtapemon obmsh
+
+obm/libobm.a:
+	$(MAKE) -C obm
+
+xgterm: obm/libobm.a
+	$(MAKE) -C xgterm
+
+ximtool: obm/libobm.a
+	$(MAKE) -C ximtool
+
+xtapemon:
+	$(MAKE) -C xtapemon
+
+obmsh:
+	$(MAKE) -C obmsh
+
+clean:
+	$(MAKE) -C xtapemon clean
+	$(MAKE) -C ximtool clean
+	$(MAKE) -C xgterm clean
+	$(MAKE) -C obmsh clean
+	$(MAKE) -C obm clean

README

@@ -6,12 +6,9 @@
 
     README		This file
     README.install	Installation instructions for source or binaries
-    Imakefile		Global x11iraf Imakefile
+    Makefile		Global x11iraf Makefile
     Revisions		Package revisions log
-    X11IRAF.tmpl	Imakefile template for x11iraf
 
-    bin,<arch>		The binaries get installed here
-    lib,<arch>		The libraries get installed here
     doc			Postscript documentation for the programs
     include		The header files get installed here
     app-defaults	The applications defaults files get installed here
@@ -63,17 +60,14 @@ Before building x11iraf you should check the archives on iraf.noao.edu to
 see if there are already pre-built binaries available for your platform.
 To build x11iraf type, in the x11iraf root directory,
 
-    % xmkmf
-    % make World		# (or preferably, make World >& spool &)
-
-This will do a "make World", build everything, and install into the x11iraf
-bin and other install directories.  To install somewhere else you can manually
-move the binaries to /usr/local/bin or wherever you wish to install them.
-Alternatively the X11IRAF.tmpl file can be edited to customize the install.
-The minimal install requires moving the executables in bin to a public
-directory, and installing the app-defaults files "XGterm" and "XTapemon".
-ximtool does not require installation of an app-defaults file.  See the
-manual pages for more detailed configuration instructions.
+    % make      		# (or preferably, make 2>&1 | tee spool)
+
+This will do a "make", build everything.  To install somewhere else you
+can manually move the binaries to /usr/local/bin or wherever you wish
+to install them.  The minimal install requires moving the executables in
+bin to a public directory, and installing the app-defaults files "XGterm"
+and "XTapemon".  ximtool does not require installation of an app-defaults
+file.  See the manual pages for more detailed configuration instructions.
 
 To build the GUIDEMO IRAF package type "mkpkg" in the guidemo directory.