move files around

Signed-off-by: Mattias Andrée <maandree@operamail.com>

34 files changed, 17 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index ad951a4..270192c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ obj/
 *.out
 *.o
 /config.mk
-/src/libgamma-config.h
+/src/lib/libgamma-config.h
 *.info
 *.pdf
 *.dvi
diff --git a/Makefile b/Makefile
index bb4dfb2..c6b893e 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ all: lib test doc
 .PHONY: lib
 lib: bin/libgamma.so.$(LIB_VERSION) bin/libgamma.so.$(LIB_MAJOR) bin/libgamma.so
 
-bin/libgamma.so.$(LIB_VERSION): $(foreach O,$(LIBOBJ),obj/$(O).o)
+bin/libgamma.so.$(LIB_VERSION): $(foreach O,$(LIBOBJ),obj/lib/$(O).o)
 	mkdir -p $(shell dirname $@)
 	$(CC) $(LIB_FLAGS) $(LIBS_LD) -shared -Wl,-soname,libgamma.so.$(LIB_MAJOR) -o $@ $^
 
@@ -120,12 +120,12 @@ bin/libgamma.so:
 	mkdir -p $(shell dirname $@)
 	ln -s libgamma.so.$(LIB_VERSION) $@
 
-obj/%.o: src/%.c src/*.h
+obj/lib/%.o: src/lib/%.c src/lib/*.h
 	mkdir -p $(shell dirname $@)
 	$(CC) $(LIB_FLAGS) $(LIBS_C) -fPIC -c -o $@ $<
 
-obj/%.o: obj/%.c src/*.h
-	$(CC) $(LIB_FLAGS) $(LIBS_C) -fPIC -iquote"src" -c -o $@ $<
+obj/lib/%.o: obj/lib/%.c src/lib/*.h
+	$(CC) $(LIB_FLAGS) $(LIBS_C) -fPIC -iquote"$$(dirname "$<" | sed -e 's:^obj:src:')" -c -o $@ $<
 
 obj/%: src/%.gpp
 	mkdir -p $(shell dirname $@)
@@ -135,19 +135,19 @@ obj/%: src/%.gpp
 .PHONY: test
 test: bin/test
 
-bin/test: $(foreach O,$(TESTOBJ),obj/$(O).o) bin/libgamma.so.$(LIB_VERSION) bin/libgamma.so
+bin/test: $(foreach O,$(TESTOBJ),obj/test/$(O).o) bin/libgamma.so.$(LIB_VERSION) bin/libgamma.so
 	mkdir -p $(shell dirname $@)
-	$(CC) $(TEST_FLAGS) $(LIBS_LD) -Lbin -lgamma -o $@ $(foreach O,$(TESTOBJ),obj/$(O).o)
+	$(CC) $(TEST_FLAGS) $(LIBS_LD) -Lbin -lgamma -o $@ $(foreach O,$(TESTOBJ),obj/test/$(O).o)
 
-obj/%.o: test/%.c
+obj/test/%.o: src/test/%.c
 	mkdir -p $(shell dirname $@)
-	$(CC) $(TEST_FLAGS) -Isrc -c -o $@ $<
+	$(CC) $(TEST_FLAGS) -Isrc/lib -c -o $@ $<
 
 
 .PHONY: doc
 doc: info pdf dvi ps
 
-obj/libgamma.texinfo: info/libgamma.texinfo $(foreach H,$(HEADERS_INFO),src/$(H).h)
+obj/libgamma.texinfo: info/libgamma.texinfo $(foreach H,$(HEADERS_INFO),src/lib/$(H).h)
 	mkdir -p obj
 	$(GPP) --symbol '£' --input $< --output $@
 
@@ -267,5 +267,5 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	-rm -f .config.mk src/libgamma-config.h
+	-rm -f .config.mk src/lib/libgamma-config.h
 
diff --git a/configure b/configure
index 87c0786..a608531 100755
--- a/configure
+++ b/configure
@@ -79,7 +79,7 @@ done
 
 
 exec 3> "$(dirname "$0")/.config.mk"
-exec 4> "$(dirname "$0")/src/libgamma-config.h"
+exec 4> "$(dirname "$0")/src/lib/libgamma-config.h"
 echo 'DEFINITIONS =' >&3
 
 echo '/**' >&4
diff --git a/info/libgamma.texinfo b/info/libgamma.texinfo
index 2189a9d..fead5de 100644
--- a/info/libgamma.texinfo
+++ b/info/libgamma.texinfo
@@ -30,8 +30,8 @@ Texts. A copy of the license is included in the section entitled
 @end copying
 
 £>set -u
-£>cd info
-£>export PATH=".:${PATH}"
+£>cd src/extract
+£>export PATH=".:../../info:${PATH}"
 
 @ifnottex
 @node Top
diff --git a/info/libgamma-error-extract b/src/extract/libgamma-error-extract
index 3f4aa1f..09169f8 100755
--- a/info/libgamma-error-extract
+++ b/src/extract/libgamma-error-extract
@@ -20,7 +20,7 @@
 import sys
 import os
 
-with open(os.path.dirname(sys.argv[0]) + '/../src/libgamma-error.h', 'rb') as file:
+with open(os.path.dirname(sys.argv[0]) + '/../lib/libgamma-error.h', 'rb') as file:
     data = file.read()
 data = data.decode('utf-8', 'error')
 
diff --git a/info/libgamma-method-extract b/src/extract/libgamma-method-extract
index 82dce77..983f606 100755
--- a/info/libgamma-method-extract
+++ b/src/extract/libgamma-method-extract
@@ -20,7 +20,7 @@
 import sys
 import os
 
-with open(os.path.dirname(sys.argv[0]) + '/../src/libgamma-method.h', 'rb') as file:
+with open(os.path.dirname(sys.argv[0]) + '/../lib/libgamma-method.h', 'rb') as file:
     data = file.read()
 data = data.decode('utf-8', 'error')
 
diff --git a/src/edid.c b/src/lib/edid.c
index 76867c7..76867c7 100644
--- a/src/edid.c
+++ b/src/lib/edid.c
diff --git a/src/edid.h b/src/lib/edid.h
index 68df0e9..68df0e9 100644
--- a/src/edid.h
+++ b/src/lib/edid.h
diff --git a/src/fake-quartz-cg.c b/src/lib/fake-quartz-cg.c
index f599dbb..f599dbb 100644
--- a/src/fake-quartz-cg.c
+++ b/src/lib/fake-quartz-cg.c
diff --git a/src/fake-quartz-cg.h b/src/lib/fake-quartz-cg.h
index 8f995ea..8f995ea 100644
--- a/src/fake-quartz-cg.h
+++ b/src/lib/fake-quartz-cg.h
diff --git a/src/fake-w32-gdi.c b/src/lib/fake-w32-gdi.c
index 541b3c8..541b3c8 100644
--- a/src/fake-w32-gdi.c
+++ b/src/lib/fake-w32-gdi.c
diff --git a/src/fake-w32-gdi.h b/src/lib/fake-w32-gdi.h
index 1995847..1995847 100644
--- a/src/fake-w32-gdi.h
+++ b/src/lib/fake-w32-gdi.h
diff --git a/src/gamma-dummy.c b/src/lib/gamma-dummy.c
index e508b4a..e508b4a 100644
--- a/src/gamma-dummy.c
+++ b/src/lib/gamma-dummy.c
diff --git a/src/gamma-dummy.h b/src/lib/gamma-dummy.h
index 342d119..342d119 100644
--- a/src/gamma-dummy.h
+++ b/src/lib/gamma-dummy.h
diff --git a/src/gamma-helper.c b/src/lib/gamma-helper.c
index dd4e027..dd4e027 100644
--- a/src/gamma-helper.c
+++ b/src/lib/gamma-helper.c
diff --git a/src/gamma-helper.h b/src/lib/gamma-helper.h
index e0711ff..e0711ff 100644
--- a/src/gamma-helper.h
+++ b/src/lib/gamma-helper.h
diff --git a/src/gamma-linux-drm.c b/src/lib/gamma-linux-drm.c
index 36ba442..36ba442 100644
--- a/src/gamma-linux-drm.c
+++ b/src/lib/gamma-linux-drm.c
diff --git a/src/gamma-linux-drm.h b/src/lib/gamma-linux-drm.h
index 3d244aa..3d244aa 100644
--- a/src/gamma-linux-drm.h
+++ b/src/lib/gamma-linux-drm.h
diff --git a/src/gamma-quartz-cg.c b/src/lib/gamma-quartz-cg.c
index 3832ca5..3832ca5 100644
--- a/src/gamma-quartz-cg.c
+++ b/src/lib/gamma-quartz-cg.c
diff --git a/src/gamma-quartz-cg.h b/src/lib/gamma-quartz-cg.h
index 90f5244..90f5244 100644
--- a/src/gamma-quartz-cg.h
+++ b/src/lib/gamma-quartz-cg.h
diff --git a/src/gamma-w32-gdi.c b/src/lib/gamma-w32-gdi.c
index f8c00ee..f8c00ee 100644
--- a/src/gamma-w32-gdi.c
+++ b/src/lib/gamma-w32-gdi.c
diff --git a/src/gamma-w32-gdi.h b/src/lib/gamma-w32-gdi.h
index 0e17720..0e17720 100644
--- a/src/gamma-w32-gdi.h
+++ b/src/lib/gamma-w32-gdi.h
diff --git a/src/gamma-x-randr.c b/src/lib/gamma-x-randr.c
index 9870f6b..9870f6b 100644
--- a/src/gamma-x-randr.c
+++ b/src/lib/gamma-x-randr.c
diff --git a/src/gamma-x-randr.h b/src/lib/gamma-x-randr.h
index dc1ecdc..dc1ecdc 100644
--- a/src/gamma-x-randr.h
+++ b/src/lib/gamma-x-randr.h
diff --git a/src/gamma-x-vidmode.c b/src/lib/gamma-x-vidmode.c
index a73f36f..a73f36f 100644
--- a/src/gamma-x-vidmode.c
+++ b/src/lib/gamma-x-vidmode.c
diff --git a/src/gamma-x-vidmode.h b/src/lib/gamma-x-vidmode.h
index 8378726..8378726 100644
--- a/src/gamma-x-vidmode.h
+++ b/src/lib/gamma-x-vidmode.h
diff --git a/src/libgamma-error.c.gpp b/src/lib/libgamma-error.c.gpp
index 9b274ab..d443f74 100644
--- a/src/libgamma-error.c.gpp
+++ b/src/lib/libgamma-error.c.gpp
@@ -28,7 +28,7 @@
 
 
 £>set -u
-£>cd info
+£>cd src/extract
 £>export PATH=".:${PATH}"
 
 
diff --git a/src/libgamma-error.h b/src/lib/libgamma-error.h
index 06a7077..06a7077 100644
--- a/src/libgamma-error.h
+++ b/src/lib/libgamma-error.h
diff --git a/src/libgamma-facade.c b/src/lib/libgamma-facade.c
index c94d9e3..c94d9e3 100644
--- a/src/libgamma-facade.c
+++ b/src/lib/libgamma-facade.c
diff --git a/src/libgamma-facade.h b/src/lib/libgamma-facade.h
index fdf46ae..fdf46ae 100644
--- a/src/libgamma-facade.h
+++ b/src/lib/libgamma-facade.h
diff --git a/src/libgamma-method.c b/src/lib/libgamma-method.c
index 4c81549..4c81549 100644
--- a/src/libgamma-method.c
+++ b/src/lib/libgamma-method.c
diff --git a/src/libgamma-method.h b/src/lib/libgamma-method.h
index 8496631..8496631 100644
--- a/src/libgamma-method.h
+++ b/src/lib/libgamma-method.h
diff --git a/src/libgamma.h b/src/lib/libgamma.h
index 9a5b9be..9a5b9be 100644
--- a/src/libgamma.h
+++ b/src/lib/libgamma.h
diff --git a/test/test.c b/src/test/test.c
index 011136e..011136e 100644
--- a/test/test.c
+++ b/src/test/test.c