diff --git a/Makefile b/Makefile index a1ce54ecd9..3ce83f5eff 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,11 @@ default: @cd lib; $(MAKE) @cd src; $(MAKE) +# link in motif libs statically +static: + @cd lib; $(MAKE) + @cd src; $(MAKE) static + depend: @cd lib; $(MAKE) depend @cd src; $(MAKE) depend diff --git a/Makefile.in b/Makefile.in index 653019271a..dfc166b048 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,6 +49,11 @@ default: @cd lib; $(MAKE) @cd src; $(MAKE) +# link in motif libs statically +static: + @cd lib; $(MAKE) + @cd src; $(MAKE) static + depend: @cd lib; $(MAKE) depend @cd src; $(MAKE) depend diff --git a/README b/README index bdb9fc1744..664cacf45b 100644 --- a/README +++ b/README @@ -67,16 +67,35 @@ http://www3.hmc.edu/~rclark/xacc/ Running: -------- -If you have a binary version of xacc, just start xacc at the -command line with "xacc". Sample accounts can be found in +The binary-only distribution includes two files: 'xacc' and +'xacc-static'. The former requires a Motif shared library; +the latter has Motif statically linked in. If you have Motif, +then just run xacc. If you do not have Motif, then copy +'xacc-static' to 'xacc'. + +Access to the on-line help documentation requires the that +the environment variable XACC_HELP be set to the 'Docs' +directory. For example, for csh/tcsh, + +% setenv XACC_HELP /usr/local/share/xacc/Docs + +or, for bash/bsh/ksh/sh + +% set XACC_HELP=/usr/local/share/xacc/Docs +% export XACC_HELP + +You can then start xacc at the command-line, with +"xacc" or "xacc ", where is an +xacc account file. Sample accounts can be found in "data" subdirectory. *.dat files are xacc accounts that can opened with the "Open File" menu entry. *.qif files are Quicken Import Format files that can be opened with the "Import QIF" menu entry. -To install: ------------ -This step does not apply to binary distributions; only to + +Building & Installing: +---------------------- +These steps does not apply to binary distributions; only to source distributions. Normally, to build and install xacc, all you have to do is: @@ -97,20 +116,6 @@ single copy of the source tree: # make # make install -Post-install instructions: - - You have to set the environment variable XACC_HELP to point - to the xacc help files. For example: - - % setenv XACC_HELP /usr/local/share/xacc - - for the tcsh shell, or: - - % set XACC_HELP=/usr/local/share/xacc - - for csh. - - sorry, no "make install" yet. diff --git a/src/Makefile b/src/Makefile index 57e5e92b8b..9e0bfd11d9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -44,6 +44,7 @@ LFLAGS = -O2 LIBS = -lXpm -lXm -lXmu -lXt -lXext -lSM -lICE -lX11 -lpng -ljpeg -lz -lm LIBPATH = -L/lib -L/usr/lib -L/usr/X11R6/lib/. TARGET = ../xacc +STATIC = ../xacc-static # LIBHTMLW = ../lib/libhtmlw/libhtmlw.a LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a @@ -65,6 +66,12 @@ $(TARGET): $(OBJS) @echo "++++++" $(CC) $(LFLAGS) $(OBJS) $(LIBPATH) $(LIBS) -o $@ +static: $(STATIC) + +$(STATIC): $(OBJS) + @echo "++++++" + $(CC) $(LFLAGS) $(OBJS) $(LIBPATH) $(LIBS) -o $@ -static + .c.o: @echo "+++" $(CC) -c $(CFLAGS) $(INCLPATH) $< diff --git a/src/Makefile.in b/src/Makefile.in index 206e862c63..9a803f176a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -44,6 +44,7 @@ LFLAGS = @lflags@ LIBS = @LIBS@ LIBPATH = -L/lib -L/usr/lib -L@x_libraries@/. TARGET = ../xacc +STATIC = ../xacc-static # LIBHTMLW = ../lib/libhtmlw/libhtmlw.a LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a @@ -65,6 +66,12 @@ $(TARGET): $(OBJS) @echo "++++++" $(CC) $(LFLAGS) $(OBJS) $(LIBPATH) $(LIBS) -o $@ +static: $(STATIC) + +$(STATIC): $(OBJS) + @echo "++++++" + $(CC) $(LFLAGS) $(OBJS) $(LIBPATH) $(LIBS) -o $@ -static + .c.o: @echo "+++" $(CC) -c $(CFLAGS) $(INCLPATH) $<