[gtk-vnc] build: drop autotools build recipes
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] build: drop autotools build recipes
- Date: Tue, 6 Aug 2019 13:39:12 +0000 (UTC)
commit 9d1c91de1150faa22bab17223ec53adaaf4ddcc1
Author: Daniel P. Berrangé <berrange redhat com>
Date: Mon Aug 5 16:53:08 2019 +0100
build: drop autotools build recipes
Signed-off-by: Daniel P. Berrangé <berrange redhat com>
.gitignore | 3 +
GNUmakefile | 5 -
Makefile.am | 90 ----------
acinclude.m4 | 25 ---
autogen.sh | 57 ------
config-meson.h.in => config.h.in | 0
configure.ac | 359 -------------------------------------
examples/Makefile.am | 23 ---
git.mk | 359 -------------------------------------
gtk-vnc-2.0.pc.in | 2 -
gvnc-1.0.pc.in | 2 -
gvncpulse-1.0.pc.in | 2 -
m4/gtk-vnc-warnings.m4 | 132 --------------
m4/manywarnings.m4 | 274 ----------------------------
m4/warnings.m4 | 79 ---------
meson.build | 2 +-
src/Makefile.am | 374 ---------------------------------------
tools/Makefile.am | 25 ---
vapi/Makefile.am | 64 -------
19 files changed, 4 insertions(+), 1873 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..924b77d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*~
+build/
+vroot/
diff --git a/GNUmakefile b/GNUmakefile
index 5aef9c0..8212c5b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -20,13 +20,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-_gl-Makefile := $(wildcard [M]akefile)
-ifneq ($(_gl-Makefile),)
-include Makefile
-else
srcdir = .
top_srcdir = .
-endif
# Make tar archive easier to reproduce.
export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
diff --git a/config-meson.h.in b/config.h.in
similarity index 100%
rename from config-meson.h.in
rename to config.h.in
diff --git a/gtk-vnc-2.0.pc.in b/gtk-vnc-2.0.pc.in
index b2cb24b..6197741 100644
--- a/gtk-vnc-2.0.pc.in
+++ b/gtk-vnc-2.0.pc.in
@@ -1,5 +1,3 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
diff --git a/gvnc-1.0.pc.in b/gvnc-1.0.pc.in
index b79fdf7..1380120 100644
--- a/gvnc-1.0.pc.in
+++ b/gvnc-1.0.pc.in
@@ -1,5 +1,3 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
diff --git a/gvncpulse-1.0.pc.in b/gvncpulse-1.0.pc.in
index 4768d7c..28a68e3 100644
--- a/gvncpulse-1.0.pc.in
+++ b/gvncpulse-1.0.pc.in
@@ -1,5 +1,3 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
diff --git a/meson.build b/meson.build
index d91c7e8..6219e32 100644
--- a/meson.build
+++ b/meson.build
@@ -269,7 +269,7 @@ po_dir = join_paths(meson.source_root(), 'po')
conf_data.set('tls_priority', get_option('with-tls-priority'))
configure_file(
- input: 'config-meson.h.in',
+ input: 'config.h.in',
output: 'config.h',
configuration: conf_data
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]