From: hackbard <hackbard>
Date: Tue, 18 Oct 2005 08:22:09 +0000 (+0000)
Subject: fixed nlsop for packaging ..
X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;p=physik%2Fnlsop.git

fixed nlsop for packaging ..
---

diff --git a/README b/README
index 3faa790..dc460c4 100644
--- a/README
+++ b/README
@@ -1,33 +1,46 @@
 nlsop
 #####
 
-requirements:
--------------
+requirements (including headers):
+---------------------------------
 
-- directfb api (www.directfb.org) for visualization only
+- directfb api (http://www.directfb.org) for visualization only
 
 - /dev/urandom
 
+- ncurses
+
+- fftw3 (http://fftw.org), my own discrete fourier transform api is buggy.
+
 - my own minimal api. you can get it via cvs:
 
-  cvs -d:pserver:anonymous@hackdaworld.dyndns.org:/my-code co api
+  cvs -d:pserver:anonymous@hackdaworld.org:/my-code co api
 
   you should downlaod it parllel to your nlsop dir, or use configure
   option to specify the location instead.
 
-install:
---------
+install (nlsop):
+----------------
+
+./configure &&
+make -f Makefile links &&
+make -f Makefile nlsop
+
+install other tools:
+--------------------
 
-./configure && make -f Makefile nlsop && make -f Makefile install
+make links
+make dft linescan nlsop_make_cryst nlsop_create_cbox
+(no install target)
 
-run:
-----
+run (nlsop):
+------------
 
 (use '-h' to see the individual options of every binary)
 
 nlsop_server:
 
-  install and run the binary on a stable, well connected host and enough
+  install and run the binary on a stable, well connected host with enough
   disk space for the nlsop save files.
 
 nlsop_client:
diff --git a/configure b/configure
index e1f692c..056e71a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-name="nlsop_server nlsop_client nlsop_gui nlsop_make_cryst"
+name="nlsop_server nlsop_client nlsop_gui"
 main="nlsop"
 
 #defaults
diff --git a/makefile b/makefile
index 9ecc4f4..d8053b4 100644
--- a/makefile
+++ b/makefile
@@ -5,7 +5,7 @@ INCLUDEDIR = /usr/include
 CFLAGS = -O3 -Wall
 LIBS = -lncurses -lm -lfftw3
 
-OBJS = network.o event.o input.o display.o audio.o fourier.o bmp.o
+OBJS = network.o event.o input.o display.o fourier.o bmp.o
 
 dft: links $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) dft.c $(LIBS)
@@ -13,6 +13,12 @@ dft: links $(OBJS)
 linescan: links $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) linescan.c $(LIBS)
 
+nlsop_make_cryst: links $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) nlsop_make_cryst.c $(LIBS)
+
+nlsop_create_cbox: links $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) nlsop_create_cbox.c $(LIBS)
+
 3dplot: links $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) 3dplot.c $(LIBS)
 
@@ -25,7 +31,6 @@ links:
 	ln -sf ../api/event/event.{c,h} .
 	ln -sf ../api/input/input.{c,h} .
 	ln -sf ../api/display/display.{c,h} .
-	ln -sf ../api/audio/audio.{c,h} .
 	ln -sf ../api/network/network.{c,h} .
 	ln -sf ../api/list/list.{c,h} .
 	ln -sf ../api/fourier/fourier.{c,h} .