From 6c093b6217907d65020ace660563ba3a1c6b4b67 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 28 Nov 2007 07:15:01 +0000 Subject: [PATCH] * Generate CLI .config files at configure time so that we can embed the library version and not rely on .so being present. --- configure.ac | 2 ++ csharp/.gitignore | 1 + csharp/Makefile.am | 4 ++-- csharp/caca-sharp.dll.config | 3 --- csharp/caca-sharp.dll.config.in | 3 +++ csharp/cucul-sharp.dll.config | 3 --- csharp/cucul-sharp.dll.config.in | 3 +++ 7 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 csharp/caca-sharp.dll.config create mode 100644 csharp/caca-sharp.dll.config.in delete mode 100644 csharp/cucul-sharp.dll.config create mode 100644 csharp/cucul-sharp.dll.config.in diff --git a/configure.ac b/configure.ac index 2e31e3f..764b9a0 100644 --- a/configure.ac +++ b/configure.ac @@ -447,6 +447,8 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ cucul/cucul.pc caca/caca.pc + csharp/cucul-sharp.dll.config + csharp/caca-sharp.dll.config doc/doxygen.cfg ]) AC_CONFIG_FILES([caca-config], [chmod 0755 caca-config]) diff --git a/csharp/.gitignore b/csharp/.gitignore index 6a74613..f94a09f 100644 --- a/csharp/.gitignore +++ b/csharp/.gitignore @@ -1 +1,2 @@ *.dll +*.config diff --git a/csharp/Makefile.am b/csharp/Makefile.am index a3cfc43..9733b0e 100644 --- a/csharp/Makefile.am +++ b/csharp/Makefile.am @@ -12,8 +12,8 @@ caca_DATA = caca-sharp.dll caca-sharp.dll.config noinst_DATA = test.exe endif -EXTRA_DIST = $(cucul_sources) cucul-sharp.dll.config \ - $(caca_sources) caca-sharp.dll.config \ +EXTRA_DIST = $(cucul_sources) cucul-sharp.dll.config.in \ + $(caca_sources) caca-sharp.dll.config.in \ test.cs cucul-sharp.dll: $(cucul_sources) diff --git a/csharp/caca-sharp.dll.config b/csharp/caca-sharp.dll.config deleted file mode 100644 index ea9fe67..0000000 --- a/csharp/caca-sharp.dll.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/csharp/caca-sharp.dll.config.in b/csharp/caca-sharp.dll.config.in new file mode 100644 index 0000000..8938658 --- /dev/null +++ b/csharp/caca-sharp.dll.config.in @@ -0,0 +1,3 @@ + + + diff --git a/csharp/cucul-sharp.dll.config b/csharp/cucul-sharp.dll.config deleted file mode 100644 index 1300342..0000000 --- a/csharp/cucul-sharp.dll.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/csharp/cucul-sharp.dll.config.in b/csharp/cucul-sharp.dll.config.in new file mode 100644 index 0000000..3b61b80 --- /dev/null +++ b/csharp/cucul-sharp.dll.config.in @@ -0,0 +1,3 @@ + + +