diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile index 64de125135..5d7aeab73a 100644 --- a/sw/logalizer/Makefile +++ b/sw/logalizer/Makefile @@ -33,12 +33,12 @@ LABLGTK2GLADE = $(shell ocamlfind query -p-format lablgtk2.glade 2>/dev/null) ifeq ($(USE_LABELGTK),lablgtk2) # only compile it lablgtk2.glade is installed ifeq ($(LABLGTK2GLADE),) -XPKG = -package pprz.xlib,lablgtk2 -XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink +XPKG = -package lablgtk2,pprz.xlib +XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink,$(USE_LABELGTK) all : play plotter sd2log plotprofile openlog2tlm sdlogger_download else XPKG = -package lablgtk2,pprz.xlib,lablgtk2.glade -XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink +XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink,$(USE_LABELGTK) all : play plotter logplotter sd2log plotprofile openlog2tlm sdlogger_download endif else # no gtk2 diff --git a/sw/supervision/Makefile b/sw/supervision/Makefile index 59b56cdad6..0592892c35 100644 --- a/sw/supervision/Makefile +++ b/sw/supervision/Makefile @@ -49,12 +49,14 @@ PAPARAZZICENTERCMO = gtk_pc.cmo gtk_process.cmo pc_common.cmo pc_control_panel.c # only compile it lablgtk2.glade is installed ifneq ($(LABLGTK2GLADE),) all: paparazzicenter - +else # no lablgtk2 glade +all : + @echo Skipping legacy Paparazzi Center build, no lablgtk2-glade endif -else # no gtk2 +else # no lablgtk2 all : - @echo Skipping legacy Paparazzi Center build + @echo Skipping legacy Paparazzi Center build, no lablgtk2 endif paparazzicenter : $(PAPARAZZICENTERCMO) $(LIBPPRZCMA) $(LIBPPRZLINKCMA) $(XLIBPPRZCMA)