drop legacy build system

8 files changed, 11 insertions, 628 deletions

diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index de30fda..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,258 +0,0 @@
-# config
-srcdir	= .
-VPATH	= $(srcdir)
--include Make.config
-include $(srcdir)/mk/Variables.mk
-
-resdir	=  $(DESTDIR)$(RESDIR)
-
-# fixup flags
-CFLAGS	+= -DVERSION='"$(VERSION)"' -I$(srcdir)
-CFLAGS	+= -Wno-pointer-sign
-
-# hard build deps
-PKG_CONFIG = pkg-config
-PKGS_IDA := libexif libpng libtiff-4 pixman-1
-PKGS_FBI := freetype2 fontconfig libdrm libexif libpng libtiff-4 pixman-1 libudev libinput
-PKGS_FBPDF := libdrm poppler-glib gbm egl epoxy pixman-1 libudev libinput
-PKGS_KTEST := libudev libinput
-HAVE_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) $(PKGS_FBPDF) && echo yes)
-
-# map pkg-config names to debian packages using apt-file
-APT_REGEX = /($(shell echo $(PKGS_FBI) $(PKGS_FBPDF) | sed -e 's/ /|/g')).pc
-APT_DEBS  = $(shell apt-file search --package-only --regex "$(APT_REGEX)")
-
-ifeq ($(HAVE_LINUX_FB_H),yes)
-ifneq ($(HAVE_DEPS),yes)
-.PHONY: deps
-deps:
-	@echo "Build dependencies missing for fbi and/or fbpdf."
-	@echo "  fbi   needs:  $(PKGS_FBI)"
-	@echo "  fbpdf needs:  $(PKGS_FBPDF)"
-	@echo "Please install.  Try 'make yum', 'make dnf' or 'make apt-get' (needs sudo)."
-	@false
-
-yum dnf:
-	sudo $@ install $(patsubst %,"pkgconfig(%)",$(PKGS_FBI) $(PKGS_FBPDF))
-
-apt-get:
-	sudo apt-get install $(APT_DEBS)
-
-endif
-endif
-
-# default target
-all: build
-
-# what to build
-TARGETS := exiftran thumbnail.cgi
-ifeq ($(HAVE_LINUX_FB_H),yes)
-  TARGETS += fbi fbpdf kbdtest
-endif
-ifeq ($(HAVE_MOTIF),yes)
-  TARGETS += ida
-endif
-
-
-#################################################################
-# poor man's autoconf ;-)
-
-include $(srcdir)/mk/Autoconf.mk
-
-ac_jpeg_ver = $(shell \
-	$(call ac_init,for libjpeg version);\
-	$(call ac_s_cmd, $(srcdir)/scripts/jpeg-version.sh);\
-	$(call ac_fini))
-
-define make-config
-LIB		:= $(LIB)
-RESDIR		:= $(call ac_resdir)
-HAVE_LINUX_FB_H	:= $(call ac_header,linux/fb.h)
-HAVE_LIBPCD	:= $(call ac_lib,pcd_open,pcd)
-HAVE_LIBGIF	:= $(call ac_lib,DGifOpenFileName,gif)
-HAVE_LIBWEBP	:= $(call ac_pkg_config,libwebp)
-HAVE_MOTIF	:= $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11)
-JPEG_VER        := $(call ac_jpeg_ver)
-endef
-
-# transposing
-CFLAGS  += -Ijpeg/$(JPEG_VER)
-
-########################################################################
-# conditional stuff
-
-ifeq ($(HAVE_LIBWEBP),yes)
-  PKGS_IDA += libwebp
-  PKGS_FBI += libwebp
-endif
-
-libraries       = PCD GIF
-ida_libs	= PCD GIF WEBP
-fbi_libs	= PCD GIF WEBP
-
-PCD_LDLIBS	:= -lpcd
-GIF_LDLIBS	:= -lgif
-
-WEBP_OBJS	:= rd/read-webp.o
-PCD_OBJS	:= rd/read-pcd.o
-GIF_OBJS	:= rd/read-gif.o
-
-# common objs
-OBJS_READER	:= readers.o rd/read-ppm.o rd/read-bmp.o rd/read-jpeg.o \
-                   rd/read-png.o rd/read-tiff.o
-OBJS_WRITER	:= writers.o wr/write-ppm.o wr/write-ps.o wr/write-jpeg.o \
-                   wr/write-png.o wr/write-tiff.o
-
-# update various flags depending on HAVE_*
-CFLAGS		+= $(call ac_lib_cflags,$(libraries))
-CFLAGS		+= $(call ac_lib_mkvar,$(libraries),CFLAGS)
-LDFLAGS		+= $(call ac_lib_mkvar,$(libraries),LDFLAGS)
-
-# link which conditional libs
-ida : LDLIBS += $(call ac_lib_mkvar,$(ida_libs),LDLIBS)
-fbi : LDLIBS += $(call ac_lib_mkvar,$(fbi_libs),LDLIBS)
-
-
-########################################################################
-# rules for the small tools
-
-# jpeg/exif libs
-exiftran      : LDLIBS += -ljpeg -lexif -lm
-exiftran      : CFLAGS += $(shell $(PKG_CONFIG) --cflags pixman-1)
-exiftran      : LDLIBS += $(shell $(PKG_CONFIG) --libs   pixman-1)
-thumbnail.cgi : LDLIBS += -lexif -lm
-
-exiftran: exiftran.o genthumbnail.o jpegtools.o \
-	jpeg/$(JPEG_VER)/transupp.o \
-	filter.o op.o readers.o rd/read-jpeg.o
-thumbnail.cgi: thumbnail.cgi.o
-
-
-########################################################################
-# rules for ida
-
-# object files
-OBJS_IDA := \
-	ida.o man.o hex.o x11.o viewer.o dither.o icons.o \
-	parseconfig.o idaconfig.o fileops.o desktop.o \
-	RegEdit.o selections.o xdnd.o jpeg/$(JPEG_VER)/transupp.o \
-	filebutton.o filelist.o browser.o jpegtools.o \
-	op.o filter.o lut.o color.o \
-	rd/read-xwd.o rd/read-xpm.o 
-OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
-
-# for X11 + Motif
-ida : CFLAGS	+= -I/usr/X11R6/include
-ida : LDFLAGS	+= -L/usr/X11R6/$(LIB)
-ida : LDLIBS	+= -lXm -lXpm -lXt -lXext -lX11
-
-# jpeg/exif libs
-ida : CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS_IDA))
-ida : LDLIBS += $(shell $(PKG_CONFIG) --libs   $(PKGS_IDA))
-ida : LDLIBS += -ljpeg -lm
-
-# RegEdit.c is good old K&R ...
-RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes -Wno-maybe-uninitialized
-
-ida: $(OBJS_IDA) $(OBJS_READER) $(OBJS_WRITER)
-
-Ida.ad.h: Ida.ad $(srcdir)/scripts/fallback.pl
-	perl $(srcdir)/scripts/fallback.pl $< $@
-
-logo.h: logo.jpg
-	scripts/hexify.sh $< $@
-
-ida.o: Ida.ad.h logo.h
-
-
-########################################################################
-# rules for fbi
-
-# object files
-OBJS_FBI := \
-	fbi.o vt.o kbd.o fbtools.o drmtools.o fb-gui.o desktop.o \
-	parseconfig.o fbiconfig.o \
-	jpegtools.o jpeg/$(JPEG_VER)/transupp.o \
-	dither.o filter.o op.o
-OBJS_FBI += $(filter-out wr/%,$(call ac_lib_mkvar,$(fbi_libs),OBJS))
-
-# font + drm + jpeg/exif libs
-fbi : CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS_FBI))
-fbi : LDLIBS += $(shell $(PKG_CONFIG) --libs   $(PKGS_FBI))
-fbi : LDLIBS += -ljpeg -lm
-
-fbi: $(OBJS_FBI) $(OBJS_READER)
-
-
-########################################################################
-# rules for fbpdf
-
-# object files
-OBJS_FBPDF := \
-	fbpdf.o vt.o kbd.o fbtools.o drmtools.o drmtools-egl.o \
-	fbiconfig.o parseconfig.o
-
-# font + drm + jpeg/exif libs
-fbpdf : CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS_FBPDF))
-fbpdf : LDLIBS += $(shell $(PKG_CONFIG) --libs   $(PKGS_FBPDF))
-
-fbpdf: $(OBJS_FBPDF)
-
-
-########################################################################
-# rules for kbdtest
-
-kbdtest : CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS_KTEST))
-kbdtest : LDLIBS += $(shell $(PKG_CONFIG) --libs   $(PKGS_KTEST))
-
-kbdtest : kbdtest.o kbd.o
-
-########################################################################
-# general rules
-
-.PHONY: check-libjpeg build install clean distclean realclean
-build: check-libjpeg $(TARGETS)
-
-check-libjpeg:
-	@test -d jpeg/$(JPEG_VER) || \
-		( echo "Need files from libjpeg $(JPEG_VER) in jpeg/"; false)
-
-install: build
-	$(INSTALL_DIR) $(bindir)
-	$(INSTALL_DIR) $(mandir)/man1
-	$(INSTALL_BINARY) exiftran $(bindir)
-	$(INSTALL_DATA) $(srcdir)/man/exiftran.1 $(mandir)/man1
-ifeq ($(HAVE_LINUX_FB_H),yes)
-	$(INSTALL_BINARY) fbi $(bindir)
-	$(INSTALL_SCRIPT) fbgs $(bindir)
-	$(INSTALL_SCRIPT) fbpdf $(bindir)
-	$(INSTALL_DATA) $(srcdir)/man/fbi.1 $(mandir)/man1
-	$(INSTALL_DATA) $(srcdir)/man/fbgs.1 $(mandir)/man1
-endif
-ifeq ($(HAVE_MOTIF),yes)
-	$(INSTALL_BINARY) ida $(bindir)
-	$(INSTALL_DATA) $(srcdir)/man/ida.1 $(mandir)/man1
-	$(INSTALL_DIR) $(resdir)/app-defaults
-	$(INSTALL_DATA) $(srcdir)/Ida.ad $(resdir)/app-defaults/Ida
-endif
-
-clean:
-	-rm -f *.o jpeg/$(JPEG_VER)/*.o rd/*.o wr/*.o $(depfiles) core core.*
-
-realclean distclean: clean
-	-rm -f Make.config
-	-rm -f $(TARGETS) *~ rd/*~ wr/*~ xpm/*~ Ida.ad.h logo.h
-
-
-include $(srcdir)/mk/Compile.mk
--include $(depfiles)
-
-
-########################################################################
-# maintainer stuff
-
-include $(srcdir)/mk/Maintainer.mk
-
-#sync::
-#	cp $(srcdir)/../xawtv/common/parseconfig.[ch] $(srcdir)
-#	cp $(srcdir)/../xawtv/console/fbtools.[ch] $(srcdir)
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0cf8607
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+MESON	:= $(shell which meson 2>/dev/null)
+NINJA	:= $(shell which ninja-build 2>/dev/null || which ninja 2>/dev/null)
+HOST	:= $(shell hostname -s)
+BDIR	:= build-meson-$(HOST)
+
+build: $(BDIR)/build.ninja
+	$(NINJA) -C $(BDIR)
+
+$(BDIR)/build.ninja:
+	$(MESON) $(BDIR)
+
diff --git a/mk/.cvsignore b/mk/.cvsignore
deleted file mode 100644
index 4985818..0000000
--- a/mk/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.dep
diff --git a/mk/.gitignore b/mk/.gitignore
deleted file mode 100644
index 4985818..0000000
--- a/mk/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.dep
diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk
deleted file mode 100644
index 45177a2..0000000
--- a/mk/Autoconf.mk
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# simple autoconf system for GNU make
-#
-# (c) 2002-2006 Gerd Hoffmann <kraxel@suse.de>
-#
-# credits for creating this one go to the autotools people because
-# they managed it to annoy lots of developers and users (including
-# me) with version incompatibilities.
-#
-# This file is public domain.  No warranty.  If it breaks you keep
-# both pieces.
-#
-########################################################################
-
-# verbose yes/no
-verbose		?= no
-
-# some stuff used by the tests
-ifneq ($(verbose),no)
-  # verbose (for debug)
-  ac_init	= echo "checking $(1) ... " >&2; rc=no
-  ac_b_cmd	= echo "run: $(1)" >&2; $(1) >/dev/null && rc=yes
-  ac_s_cmd	= echo "run: $(1)" >&2; rc=`$(1)`
-  ac_fini	= echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}"
-else
-  # normal
-  ac_init	= echo -n "checking $(1) ... " >&2; rc=no
-  ac_b_cmd	= $(1) >/dev/null 2>&1 && rc=yes
-  ac_s_cmd	= rc=`$(1) 2>/dev/null`
-  ac_fini	= echo "$${rc}" >&2; echo "$${rc}"
-endif
-
-# some helpers to build cflags and related variables
-ac_def_cflags_1 = $(if $(filter yes,$($(1))),-D$(1))
-ac_lib_cflags	= $(foreach lib,$(1),$(call ac_def_cflags_1,HAVE_LIB$(lib)))
-ac_inc_cflags	= $(foreach inc,$(1),$(call ac_def_cflags_1,HAVE_$(inc)))
-ac_lib_mkvar_1	= $(if $(filter yes,$(HAVE_LIB$(1))),$($(1)_$(2)))
-ac_lib_mkvar	= $(foreach lib,$(1),$(call ac_lib_mkvar_1,$(lib),$(2)))
-
-
-########################################################################
-# the tests ...
-
-# get uname
-ac_uname = $(shell \
-	$(call ac_init,for system);\
-	$(call ac_s_cmd,uname -s | tr 'A-Z' 'a-z');\
-	$(call ac_fini))
-
-ac_uname_arch = $(shell \
-	$(call ac_init,for arch);\
-	$(call ac_s_cmd,uname -m | tr 'A-Z' 'a-z');\
-	$(call ac_fini))
-
-# check for some header file
-# args: header file
-ac_header = $(shell \
-	$(call ac_init,for $(1));\
-	$(call ac_b_cmd,echo '\#include <$(1)>' |\
-		$(CC) $(CFLAGS) -E -);\
-	$(call ac_fini))
-
-# check for some function
-# args: function [, additional libs ]
-ac_func = $(shell \
-	$(call ac_init,for $(1));\
-	echo 'void $(1)(void); int main(void) {$(1)();return 0;}' \
-		> __actest.c;\
-	$(call ac_b_cmd,$(CC) $(CFLAGS) $(LDFLAGS) -o \
-		__actest __actest.c $(2));\
-	rm -f __actest __actest.c;\
-	$(call ac_fini))
-
-# check for some library
-# args: function, library [, additional libs ]
-ac_lib = $(shell \
-	$(call ac_init,for $(1) in $(2));\
-	echo 'void $(1)(void); int main(void) {$(1)();return 0;}' \
-		> __actest.c;\
-	$(call ac_b_cmd,$(CC) $(CFLAGS) $(LDFLAGS) -o \
-		__actest __actest.c -l$(2) $(3));\
-	rm -f __actest __actest.c;\
-	$(call ac_fini))
-
-# check if some compiler flag works
-# args: compiler flag
-ac_cflag = $(shell \
-	$(call ac_init,for $(CC) cflags);\
-	echo 'int main() {return 0;}' > __actest.c;\
-	$(call ac_b_cmd,$(CC) $(CFLAGS) $(1) $(LDFLAGS) -o \
-		__actest __actest.c);\
-	rm -f __actest __actest.c;\
-	if test "$${rc}" = "yes"; then rc="$(1)"; else rc="$(2)"; fi;\
-	$(call ac_fini))
-
-# check for some binary
-# args: binary name
-ac_binary = $(shell \
-	$(call ac_init,for $(1));\
-	$(call ac_s_cmd,which $(1));\
-	bin="$$rc";rc="no";\
-	$(call ac_b_cmd,test -x "$$$$bin");\
-	$(call ac_fini))
-
-# check if lib64 is used
-#ac_lib64 = $(shell \
-#	$(call ac_init,for libdir name);\
-#	$(call ac_s_cmd,$(CC) -print-search-dirs | grep -q lib64 &&\
-#		echo "lib64" || echo "lib");\
-#	$(call ac_fini))
-ac_lib64 = $(shell \
-	$(call ac_init,for libdir name);\
-	$(call ac_s_cmd,/sbin/ldconfig -p | grep -q lib64 &&\
-		echo "lib64" || echo "lib");\
-	$(call ac_fini))
-
-# check for x11 ressource dir prefix
-ac_resdir = $(shell \
-	$(call ac_init,for X11 app-defaults prefix);\
-	$(call ac_s_cmd, for dir in \
-		/etc/X11/app-defaults \
-		/usr/X11R6/lib/X11/app-defaults \
-		/usr/share/X11/app-defaults \
-		/usr/lib/X11/app-defaults \
-		; do test -d "$$dir" || continue;\
-		dirname "$$dir"; break; done);\
-	$(call ac_fini))
-
-# check if package is installed, via pkg-config
-# args: pkg name
-ac_pkg_config = $(shell \
-	$(call ac_init,for $(1) (using pkg-config));\
-	$(call ac_b_cmd, pkg-config $(1));\
-	$(call ac_fini))
-
-# grep some file
-# args: regex, file
-ac_grep = $(shell \
-	$(call ac_init,for $(1) in $(2));\
-	$(call ac_b_cmd, grep -q $(1) $(2));\
-	$(call ac_fini))
-
-
-########################################################################
-# build Make.config
-
-define newline
-
-
-endef
-make-config-q	= $(subst $(newline),\n,$(make-config))
-
-ifeq ($(filter config,$(MAKECMDGOALS)),config)
-.PHONY: Make.config
-  LIB := $(call ac_lib64)
-else
-  LIB ?= $(call ac_lib64)
-  LIB := $(LIB)
-endif
-.PHONY: config
-config: Make.config
-	@true
-
-Make.config: $(srcdir)/GNUmakefile
-	@/bin/echo -e "$(make-config-q)" > $@
-	@echo
-	@echo "Make.config written, edit if needed"
-	@echo
diff --git a/mk/Compile.mk b/mk/Compile.mk
deleted file mode 100644
index ae88f14..0000000
--- a/mk/Compile.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# some rules to compile stuff ...
-#
-# (c) 2002-2006 Gerd Hoffmann <kraxel@suse.de>
-#
-# main features:
-#  * autodependencies via "cpp -MD"
-#  * fancy, non-verbose output
-#
-# This file is public domain.  No warranty.  If it breaks you keep
-# both pieces.
-#
-########################################################################
-
-# verbose yes/no
-verbose		?= no
-
-# dependency files
-tmpdep		= mk/$(subst /,_,$*).tmp
-depfile		= mk/$(subst /,_,$*).dep
-depfiles	= mk/*.dep
-
-compile_c	= $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
-compile_c_pic	= $(CC) $(CFLAGS) -fPIC -Wp,-MD,$(tmpdep) -c -o $@ $<
-compile_cc	= $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
-fixup_deps	= sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
-cc_makedirs	= mkdir -p $(dir $@) $(dir $(depfile))
-
-link_app	= $(CC) $(LDFLAGS) -o $@  $^ $(LDLIBS)
-link_so		= $(CC) $(LDFLAGS) -shared -Wl,-soname,$(@F) -o $@ $^ $(LDLIBS)
-ar_lib		= rm -f $@ && ar -r $@ $^ && ranlib $@
-
-moc_h		= $(MOC) $< -o $@
-msgfmt_po	= msgfmt -o $@ $<
-
-# non-verbose output
-ifeq ($(verbose),no)
-  echo_compile_c	= echo "  CC	 " $@
-  echo_compile_c_pic	= echo "  CC	 " $@
-  echo_compile_cc	= echo "  CXX	 " $@
-  echo_link_app		= echo "  LD	 " $@
-  echo_link_so		= echo "  LD	 " $@
-  echo_ar_lib		= echo "  AR	 " $@
-  echo_moc_h		= echo "  MOC    " $@
-  echo_msgfmt_po        = echo "  MSGFMT " $@
-else
-  echo_compile_c	= echo $(compile_c)
-  echo_compile_c_pic	= echo $(compile_c_pic)
-  echo_compile_cc	= echo $(compile_cc)
-  echo_link_app		= echo $(link_app)
-  echo_link_so		= echo $(link_so)
-  echo_ar_lib		= echo $(ar_lib)
-  echo_moc_h		= echo $(moc_h)
-  echo_msgfmt_po	= echo $(msgfmt_po)
-endif
-
-%.o: %.c
-	@$(cc_makedirs)
-	@$(echo_compile_c)
-	@$(compile_c)
-	@$(fixup_deps)
-
-%.opic: %.c
-	@$(cc_makedirs)
-	@$(echo_compile_c_pic)
-	@$(compile_c_pic)
-	@$(fixup_deps)
-
-%.o: %.cc
-	@$(cc_makedirs)
-	@$(echo_compile_cc)
-	@$(compile_cc)
-	@$(fixup_deps)
-
-%.o: %.cpp
-	@$(cc_makedirs)
-	@$(echo_compile_cc)
-	@$(compile_cc)
-	@$(fixup_deps)
-
-
-%: %.o
-	@$(echo_link_app)
-	@$(link_app)
-
-%.so: %.o
-	@$(echo_link_so)
-	@$(link_so)
-
-%.a: %.o
-	@$(echo_ar_lib)
-	@$(ar_lib)
-
-
-%.moc : %.h
-	@$(echo_moc_h)
-	@$(moc_h)
-
-%.mo : %.po
-	@$(echo_msgfmt_po)
-	@$(msgfmt_po)
-
diff --git a/mk/Maintainer.mk b/mk/Maintainer.mk
deleted file mode 100644
index b0d1c5a..0000000
--- a/mk/Maintainer.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# just some maintainer stuff for me ...
-########################################################################
-
-make-sync-dir = $(HOME)/projects/gnu-makefiles
-
-.PHONY: sync
-sync:: distclean
-	test -d $(make-sync-dir)
-	rm -f $(srcdir)/INSTALL $(srcdir)/mk/*.mk
-	cp -v $(make-sync-dir)/INSTALL $(srcdir)/.
-	cp -v $(make-sync-dir)/*.mk $(srcdir)/mk
-	chmod 444 $(srcdir)/INSTALL $(srcdir)/mk/*.mk
-
-
-repository  := $(shell basename $(PWD))
-usetito     := $(shell if test -d .tito; then echo yes; else echo no; fi)
-release-dir ?= $(HOME)/projects/Releases
-release-pub ?= bigendian.kraxel.org:/public/vhosts/www.kraxel.org/releases/$(repository)
-tarball      = $(release-dir)/$(repository)-$(VERSION).tar
-
-ifeq ($(usetito),yes)
-
-$(tarball).gz:
-	tito build --output $(release-dir) --tgz
-
-else
-
-$(tarball).gz:
-	git tag -m "release $(VERSION)" "$(VERSION)"
-	git push --tags
-	git archive --format=tar --prefix=$(repository)-$(VERSION)/ \
-		-o $(tarball) $(VERSION)
-	gzip $(tarball)
-
-endif
-
-$(tarball).gz.asc: $(tarball).gz
-	gpg --detach-sign --armor $(tarball).gz
-
-.PHONY: release
-release: $(tarball).gz.asc
-	scp $(tarball).gz* $(release-pub)
-
diff --git a/mk/Variables.mk b/mk/Variables.mk
deleted file mode 100644
index 99f787c..0000000
--- a/mk/Variables.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# common variables ...
-########################################################################
-
-# directories
-DESTDIR	=
-srcdir	?= .
-prefix	?= /usr/local
-bindir	=  $(DESTDIR)$(prefix)/bin
-sbindir	=  $(DESTDIR)$(prefix)/sbin
-libdir  =  $(DESTDIR)$(prefix)/$(LIB)
-shrdir  =  $(DESTDIR)$(prefix)/share
-mandir	=  $(shrdir)/man
-locdir  =  $(shrdir)/locale
-appdir  =  $(shrdir)/applications
-
-# package + version
-empty	:=
-space	:= $(empty) $(empty)
-ifneq ($(wildcard $(srcdir)/VERSION),)
-  VERSION := $(shell cat $(srcdir)/VERSION)
-else
-  VERSION := 42
-endif
-RELTAG	:= v$(subst .,_,$(VERSION))
-
-# programs
-CC		?= gcc
-CXX		?= g++
-MOC             ?= $(if $(QTDIR),$(QTDIR)/bin/moc,moc)
-
-STRIP		?= -s
-INSTALL		?= install
-INSTALL_BINARY  := $(INSTALL) $(STRIP)
-INSTALL_SCRIPT  := $(INSTALL)
-INSTALL_DATA	:= $(INSTALL) -m 644
-INSTALL_DIR	:= $(INSTALL) -d
-
-# cflags
-CFLAGS		?= -g -O2
-CXXFLAGS	?= $(CFLAGS)
-CFLAGS		+= -Wall -Wmissing-prototypes -Wstrict-prototypes \
-		   -Wpointer-arith -Wunused
-CXXFLAGS	+= -Wall -Wpointer-arith -Wunused
-
-# add /usr/local to the search path if something is in there ...
-ifneq ($(wildcard /usr/local/include/*.h),)
-  CFLAGS  += -I/usr/local/include
-  LDFLAGS += -L/usr/local/$(LIB)
-endif
-
-# fixup include path for $(srcdir) != "."
-ifneq ($(srcdir),.)
-  CFLAGS  += -I. -I$(srcdir)
-endif
-