diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-05-30 10:33:40 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-05-30 10:33:40 +0200 |
| commit | e529b213b37ebbae4ee1c941bf466d8260fe7cee (patch) | |
| tree | 7a9fefce34313ba139fcf057b0d8730f53b85dde | |
| parent | c3013f6a42644fe939841b58979690890f878064 (diff) | |
| download | vconsole-e529b213b37ebbae4ee1c941bf466d8260fe7cee.tar.gz | |
drop gtk2 support, build system tweaks
| -rw-r--r-- | GNUmakefile | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/GNUmakefile b/GNUmakefile index 861a154..0cf8693 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,6 +5,8 @@ include mk/Variables.mk # add our flags + libs CFLAGS += -DVERSION='"$(VERSION)"' -DLIB='"$(LIB)"' CFLAGS += -Wno-pointer-sign +CFLAGS += -Wno-strict-prototypes +CFLAGS += -Wno-deprecated-declarations # valgrind options VFLAGS := --leak-check=full --show-possibly-lost=no @@ -12,7 +14,6 @@ VFLAGS := --leak-check=full --show-possibly-lost=no # build TARGETS := vconsole vpublish -# default target all: build ################################################################# @@ -22,30 +23,21 @@ include mk/Autoconf.mk define make-config LIB := $(LIB) -HAVE_GLIB := $(call ac_pkg_config,glib-2.0) -HAVE_GTHREAD := $(call ac_pkg_config,gthread-2.0) -HAVE_GTK2 := $(call ac_pkg_config,gtk+-2.0) -HAVE_VTE2 := $(call ac_pkg_config,vte) -HAVE_GTK3 := $(call ac_pkg_config,gtk+-3.0) -HAVE_VTE3 := $(call ac_pkg_config,vte-2.90) -HAVE_LIBVIRT := $(call ac_pkg_config,libvirt) +HAVE_VTE291 := $(call ac_pkg_config,vte-2.91) endef -ifeq ($(HAVE_GTK3)-$(HAVE_VTE3),yes-yes) -CFLAGS += -Wno-deprecated-declarations -wanted := $(HAVE_GLIB)-$(HAVE_GTHREAD)-$(HAVE_GTK3)-$(HAVE_VTE3)-$(HAVE_LIBVIRT) -vconsole : pkglst := glib-2.0 gthread-2.0 gtk+-3.0 vte-2.90 libvirt -vpublish : pkglst := glib-2.0 gthread-2.0 libvirt libxml-2.0 avahi-client avahi-glib +ifeq ($(HAVE_VTE291),yes) +pkgvte := vte-2.91 else -CFLAGS += -DGTK_DISABLE_SINGLE_INCLUDES -CFLAGS += -DGTK_DISABLE_DEPRECATED -CFLAGS += -DGSEAL_ENABLE -wanted := $(HAVE_GLIB)-$(HAVE_GTHREAD)-$(HAVE_GTK2)-$(HAVE_VTE2)-$(HAVE_LIBVIRT) -vconsole : pkglst := glib-2.0 gthread-2.0 gtk+-2.0 vte libvirt -vpublish : pkglst := glib-2.0 gthread-2.0 libvirt libxml-2.0 avahi-client avahi-glib +pkgvte := vte-2.90 endif +pkgs_vconsole := glib-2.0 gthread-2.0 gtk+-3.0 $(pkgvte) libvirt +pkgs_vpublish := glib-2.0 gthread-2.0 libvirt libxml-2.0 avahi-client avahi-glib +HAVE_DEPS := $(shell pkg-config $(pkgs_vconsole) $(pkgs_vpublish) && echo yes) + +vconsole : pkglst := $(pkgs_vconsole) +vpublish : pkglst := $(pkgs_vpublish) -CFLAGS += -Wno-strict-prototypes CFLAGS += $(shell pkg-config --cflags $(pkglst)) LDLIBS += $(shell pkg-config --libs $(pkglst)) @@ -57,13 +49,24 @@ SERVICE := $(wildcard $(patsubst %,%.service,$(TARGETS))) ######################################################################## # rules -ifeq ($(wanted),yes-yes-yes-yes-yes) -build: $(TARGETS) -else +ifneq ($(HAVE_DEPS),yes) + +.PHONY: deps build: - @echo "build dependencies are missing" + @echo "Build dependencies missing." + @echo " vconsole needs: $(pkgs_vconsole)" + @echo " vpublish needs: $(pkgs_vpublish)" + @echo "Please install. You can try 'make yum' (needs sudo)." @echo "" @false + +yum dnf: + sudo $@ install $(patsubst %,"pkgconfig(%)",$(pkgs_vconsole) $(pkgs_vpublish)) + +else + +build: $(TARGETS) + endif install: build |