]>
Commit | Line | Data |
---|---|---|
ba762f24 ER |
1 | --- asterisk-1.6.1.12/menuselect/Makefile~ 2008-12-11 00:00:19.000000000 +0200 |
2 | +++ asterisk-1.6.1.12/menuselect/Makefile 2009-12-30 23:14:47.201686543 +0200 | |
3 | @@ -23,6 +23,7 @@ | |
4 | # Basic set of sources and flags/libraries/includes | |
5 | OBJS:=menuselect.o strcompat.o | |
6 | CFLAGS:=-g -c -D_GNU_SOURCE -Wall | |
7 | +MXML_LIB:=$(shell pkg-config --libs mxml) | |
8 | ||
9 | ifeq ($(MENUSELECT_DEBUG),yes) | |
10 | CFLAGS += -DMENUSELECT_DEBUG | |
11 | @@ -44,19 +45,20 @@ | |
12 | ||
13 | ifdef GTK2_LIB | |
14 | G_OBJS += menuselect_gtk.o | |
15 | - G_LIBS += $(GTK2_LIB) | |
16 | + G_LIBS += $(MXML_LIB) $(GTK2_LIB) | |
17 | G_INCLUDE += $(GTK2_INCLUDE) | |
18 | ALL_TGTS += gmenuselect | |
19 | endif | |
20 | ||
21 | ifdef NEWT_LIB | |
22 | N_OBJS += menuselect_newt.o | |
23 | - N_LIBS += $(NEWT_LIB) | |
24 | + N_LIBS += $(MXML_LIB) $(NEWT_LIB) | |
25 | N_INCLUDE += $(NEWT_INCLUDE) | |
26 | ALL_TGTS += nmenuselect | |
27 | endif | |
28 | ||
29 | M_OBJS += menuselect_stub.o | |
30 | +M_LIBS += $(MXML_LIB) | |
31 | ALL_TGTS += menuselect | |
32 | ||
33 | all: $(ALL_TGTS) | |
34 | @@ -66,7 +68,7 @@ | |
35 | makeopts autoconfig.h: autoconfig.h.in makeopts.in | |
36 | @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS= | |
37 | ||
38 | -$(ALL_TGTS): mxml/libmxml.a | |
39 | +$(ALL_TGTS): | |
40 | ||
41 | ifdef C_OBJS | |
42 | menuselect_curses.o: CFLAGS+=$(C_INCLUDE) | |
43 | --- asterisk-1.6.1.12/menuselect/menuselect.c~ 2009-06-03 02:21:48.000000000 +0300 | |
44 | +++ asterisk-1.6.1.12/menuselect/menuselect.c 2009-12-30 23:18:45.881616815 +0200 | |
45 | @@ -29,8 +29,8 @@ | |
ba762f24 ER |
46 | #include <unistd.h> |
47 | #include <stdarg.h> | |
17686c6e | 48 | #include <getopt.h> |
ba762f24 ER |
49 | +#include <mxml.h> |
50 | ||
51 | -#include "mxml/mxml.h" | |
52 | #include "linkedlists.h" | |
53 | #include "menuselect.h" | |
54 |