gegl r2321 - in branches/branch_zhangjb: . operations/frequency operations/frequency/tools tests/frequency

[zhangjb svn gnome org]

Author: zhangjb
Date: Tue May 20 09:32:57 2008
New Revision: 2321
URL: http://svn.gnome.org/viewvc/gegl?rev=2321&view=rev

Log:
* operations/frequency/tools/dft.h: moved to subdir "tools"
* operations/frequency/tools/dft.c: moved to subdir "tools"
* operations/frequency/tools/Makefile.am:
* operations/frequency/dft-grey.c: modified include path
* operations/frequency/Makefile.am: added subdir "tools"
* tests/frequency/makefile: added uninstall section
* configure.ac


Added:
   branches/branch_zhangjb/operations/frequency/tools/
   branches/branch_zhangjb/operations/frequency/tools/Makefile.am
   branches/branch_zhangjb/operations/frequency/tools/dft.c
      - copied unchanged from r2319, /branches/branch_zhangjb/operations/frequency/dft.c
   branches/branch_zhangjb/operations/frequency/tools/dft.h
      - copied unchanged from r2319, /branches/branch_zhangjb/operations/frequency/dft.h
Removed:
   branches/branch_zhangjb/operations/frequency/dft.c
   branches/branch_zhangjb/operations/frequency/dft.h
Modified:
   branches/branch_zhangjb/ChangeLog
   branches/branch_zhangjb/configure.ac
   branches/branch_zhangjb/operations/frequency/Makefile.am
   branches/branch_zhangjb/operations/frequency/dft-grey.c
   branches/branch_zhangjb/tests/frequency/makefile

Modified: branches/branch_zhangjb/configure.ac
==============================================================================
--- branches/branch_zhangjb/configure.ac	(original)
+++ branches/branch_zhangjb/configure.ac	Tue May 20 09:32:57 2008
@@ -828,6 +828,7 @@
 operations/common/perlin/Makefile
 operations/external/Makefile
 operations/frequency/Makefile
+operations/frequency/tools/Makefile
 operations/generated/Makefile
 operations/workshop/Makefile
 operations/workshop/external/Makefile

Modified: branches/branch_zhangjb/operations/frequency/Makefile.am
==============================================================================
--- branches/branch_zhangjb/operations/frequency/Makefile.am	(original)
+++ branches/branch_zhangjb/operations/frequency/Makefile.am	Tue May 20 09:32:57 2008
@@ -1,3 +1,4 @@
+SUBDIRS = tools
 include $(top_srcdir)/operations/Makefile-operations.am
 
 INCLUDES = $(FFTW_CFLAGS)

Modified: branches/branch_zhangjb/operations/frequency/dft-grey.c
==============================================================================
--- branches/branch_zhangjb/operations/frequency/dft-grey.c	(original)
+++ branches/branch_zhangjb/operations/frequency/dft-grey.c	Tue May 20 09:32:57 2008
@@ -13,7 +13,8 @@
 #define GEGL_CHANT_C_FILE       "dft-grey.c"
 
 #include "gegl-chant.h"
-#include "dft.h"
+#include "tools/dft.h"
+#include "tools/dft.c"
 #include <fftw3.h>
 
 static void prepare(GeglOperation *operation)

Added: branches/branch_zhangjb/operations/frequency/tools/Makefile.am
==============================================================================
--- (empty file)
+++ branches/branch_zhangjb/operations/frequency/tools/Makefile.am	Tue May 20 09:32:57 2008
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	dft.c	\
+	dft.h
\ No newline at end of file

Modified: branches/branch_zhangjb/tests/frequency/makefile
==============================================================================
--- branches/branch_zhangjb/tests/frequency/makefile	(original)
+++ branches/branch_zhangjb/tests/frequency/makefile	Tue May 20 09:32:57 2008
@@ -2,8 +2,10 @@
 
 clean:
 	rm gegl_test
-	
+
 install:
 
+uninstall:
+
 gegl_test: hello-world-fourier.c
 	gcc -g -o gegl_test `pkg-config --libs --cflags gegl` hello-world-fourier.c 
\ No newline at end of file