Index: Makefile =================================================================== --- Makefile (revision 309) +++ Makefile (working copy) @@ -24,12 +24,12 @@ ifneq ($(NCURSES_LIB),) C_OBJS += menuselect_curses.o C_LIBS +=$(NCURSES_LIB) - INCLUDE += $(NCURSES_INCLUDE) + C_INCLUDE += $(NCURSES_INCLUDE) else ifneq ($(CURSES_LIB),) C_OBJS += menuselect_curses.o C_LIBS +=$(CURSES_LIB) - INCLUDE += $(CURSES_INCLUDE) + C_INCLUDE += $(CURSES_INCLUDE) endif endif @@ -37,27 +37,33 @@ ifneq ($(GTK2_LIB),) G_OBJS += menuselect_gtk.o G_LIBS += $(GTK2_LIB) - INCLUDE += $(GTK2_INCLUDE) + G_INCLUDE += $(GTK2_INCLUDE) endif # Pick newt if available ifneq ($(NEWT_LIB),) N_OBJS += menuselect_newt.o N_LIBS += $(NEWT_LIB) - INCLUDE += $(NEWT_INCLUDE) + N_INCLUDE += $(NEWT_INCLUDE) endif ifneq ($(N_OBJS),) M_OBJS += $(N_OBJS) M_LIBS += $(N_LIBS) - INCLUDE += $(N_INCLUDE) + M_INCLUDE += $(N_INCLUDE) else ifneq ($(C_OBJS),) M_OBJS += $(C_OBJS) M_LIBS += $(C_LIBS) - INCLUDE += $(C_INCLUDE) + M_INCLUDE += $(C_INCLUDE) else - M_OBJS += menuselect_stub.o + ifneq ($(G_OBJS),) + M_OBJS += $(G_OBJS) + M_LIBS += $(G_LIBS) + M_INCLUDE += $(G_INCLUDE) + else + M_OBJS += menuselect_stub.o + endif endif endif