]>
Commit | Line | Data |
---|---|---|
0de39d4d JB |
1 | --- ddccontrol-0.4.2/src/gnome-ddcc-applet/Makefile.am.orig 2006-06-15 18:45:19.000000000 +0200 |
2 | +++ ddccontrol-0.4.2/src/gnome-ddcc-applet/Makefile.am 2006-08-24 23:46:30.204199000 +0200 | |
63f72c18 JB |
3 | @@ -9,8 +9,8 @@ |
4 | pkglib_PROGRAMS = ddcc-applet | |
5 | ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h | |
6 | ||
0de39d4d | 7 | -ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD) |
63f72c18 | 8 | -AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"' |
0de39d4d | 9 | +ddcc_applet_LDADD = $(GNOME_APPLET_LDFLAGS) $(DDCC_LDADD) |
63f72c18 JB |
10 | +AM_CFLAGS = $(GNOME_APPLET_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"' |
11 | ||
12 | pkgdata_DATA = GNOME_ddcc-applet.xml | |
13 | ||
0de39d4d JB |
14 | --- ddccontrol-0.4.2/configure.ac.orig 2006-07-27 22:45:07.000000000 +0200 |
15 | +++ ddccontrol-0.4.2/configure.ac 2006-08-24 23:47:16.771109250 +0200 | |
16 | @@ -150,8 +150,8 @@ | |
63f72c18 | 17 | if test x$support_gnome_applet = xyes; then |
0de39d4d JB |
18 | if pkg-config --atleast-version=2.10 libpanelapplet-2.0 ; then |
19 | GNOME_APPLET="gnome-ddcc-applet" | |
20 | - GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`" | |
21 | - GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`" | |
22 | + GNOME_APPLET_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`" | |
23 | + GNOME_APPLET_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`" | |
24 | fi | |
63f72c18 JB |
25 | fi |
26 | ||
0de39d4d | 27 | @@ -160,6 +160,8 @@ |
63f72c18 | 28 | AC_SUBST([GNOME_CFLAGS]) |
63f72c18 JB |
29 | AC_SUBST([GDDCCONTROL]) |
30 | AC_SUBST([GNOME_APPLET]) | |
0de39d4d JB |
31 | +AC_SUBST([GNOME_APPLET_LDFLAGS]) |
32 | +AC_SUBST([GNOME_APPLET_CFLAGS]) | |
63f72c18 | 33 | |
0de39d4d JB |
34 | # Doc check |
35 | support_doc=no |