]>
Commit | Line | Data |
---|---|---|
bf5c5b3b | 1 | --- radioactive-1.3.1/applet/Makefile.am.orig Mon Jun 11 19:22:59 2001 |
2 | +++ radioactive-1.3.1/applet/Makefile.am Fri Feb 1 02:25:08 2002 | |
3 | @@ -1,4 +1,3 @@ | |
4 | -CXXFLAGS = -g -Wall | |
5 | INCLUDES = -I$(includedir) $(GNOMEMM_CFLAGS) $(GTKMM_CFLAGS) \ | |
6 | -I$(srcdir) -I$(top_srcdir) \ | |
7 | -DGNOMELOCALEDIR=\""$(datadir)/locale"\" | |
8 | @@ -12,10 +11,10 @@ | |
9 | radioactive_applet_LDADD = $(top_builddir)/common/libracommon.a $(PANELMM_LIBS) $(GNOMEMM_LIBS) | |
10 | ||
11 | # Desktop entry | |
12 | -Desktopdir = $(datadir)/applets/Multimedia | |
13 | -Desktop_in_files = radioactive_applet.desktop.in | |
14 | +AppletDesktopdir = $(datadir)/applets/Multimedia | |
15 | +AppletDesktop_in_files = radioactive_applet.desktop.in | |
16 | if RA_APPLET | |
17 | -Desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) | |
18 | +AppletDesktop_DATA = $(AppletDesktop_in_files:.desktop.in=.desktop) | |
19 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
20 | endif | |
21 | ||
22 | @@ -26,4 +25,4 @@ | |
23 | gnorba_DATA = $(gnorba_files) | |
24 | endif | |
25 | ||
26 | -EXTRA_DIST = $(Desktop_in_files) $(gnorba_files) | |
27 | +EXTRA_DIST = $(AppletDesktop_in_files) $(gnorba_files) | |
28 | --- radioactive-1.3.1/standalone/Makefile.am~ Fri Feb 1 02:04:53 2002 | |
29 | +++ radioactive-1.3.1/standalone/Makefile.am Fri Feb 1 02:04:53 2002 | |
30 | @@ -1,4 +1,3 @@ | |
31 | -CXXFLAGS = -g -Wall | |
32 | INCLUDES = -I$(includedir) $(GNOMEMM_CFLAGS) $(GTKMM_CFLAGS) \ | |
33 | -I$(srcdir) -I$(top_srcdir) \ | |
34 | -DGNOMELOCALEDIR=\""$(datadir)/locale"\" | |
35 | --- radioactive-1.3.1/common/Makefile.am~ Fri Feb 1 02:05:23 2002 | |
36 | +++ radioactive-1.3.1/common/Makefile.am Fri Feb 1 02:05:23 2002 | |
37 | @@ -1,4 +1,3 @@ | |
38 | -CXXFLAGS = -g -Wall | |
39 | INCLUDES = -I$(includedir) $(GNOMEMM_CFLAGS) $(GTKMM_CFLAGS) \ | |
40 | -I$(srcdir) -I$(top_srcdir) \ | |
41 | -DGNOMELOCALEDIR=\""$(datadir)/locale"\" |