2003-02-14 22:05:27 +01:00
|
|
|
$NetBSD: patch-ae,v 1.2 2003/02/14 21:05:28 jmmv Exp $
|
2002-11-04 09:28:00 +01:00
|
|
|
|
2003-02-14 22:05:27 +01:00
|
|
|
--- gnome-panel/Makefile.in.orig 2003-02-04 00:29:51.000000000 +0100
|
2002-11-04 09:28:00 +01:00
|
|
|
+++ gnome-panel/Makefile.in
|
2003-02-14 22:05:27 +01:00
|
|
|
@@ -156,7 +156,7 @@ AUTOMAKE_OPTIONS = 1.3
|
2002-11-04 09:28:00 +01:00
|
|
|
|
|
|
|
|
NULL =
|
|
|
|
|
|
|
|
|
|
-INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gnome-panel -DPANEL_DEBUG -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGLADEDIR=\""$(datadir)/gnome/panel"\" $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(ALLOW_CRACKPOT_MENU_CODE) $(PANEL_CFLAGS) $(PANELCONFIG_CFLAGS) $(WARN_CFLAGS) $(NULL)
|
|
|
|
|
+INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gnome-panel -DPANEL_DEBUG -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGLADEDIR=\""$(datadir)/gnome/panel2"\" $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(ALLOW_CRACKPOT_MENU_CODE) $(PANEL_CFLAGS) $(PANELCONFIG_CFLAGS) $(WARN_CFLAGS) $(NULL)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# FIXME:
|
2003-02-14 22:05:27 +01:00
|
|
|
@@ -172,7 +172,7 @@ DISABLE_DEPRECATED_CFLAGS = -DG_DISABL
|
2002-11-04 09:28:00 +01:00
|
|
|
STANDARD_PROPERTIES_CFLAGS = -DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DLIBDIR=\""$(libdir)"\" -DDATADIR=\""$(datadir)"\" $(NULL)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-bin_PROGRAMS = gnome-panel gnome-panel-preferences gnome-panel-screenshot gnome-desktop-item-edit
|
|
|
|
|
+bin_PROGRAMS = gnome-panel gnome-panel-preferences gnome2-panel-screenshot gnome-desktop-item-edit
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CORBA_SRCLIST = GNOME_Panel-stubs.c GNOME_Panel-skels.c GNOME_Panel-common.c GNOME_Panel.h $(NULL)
|
2003-02-14 22:05:27 +01:00
|
|
|
@@ -232,7 +232,7 @@ gnome_panel_screenshot_LDFLAGS = -export
|
|
|
|
|
gnome_panel_screenshot_LDADD = $(XSHAPE_LIBS) $(X_LIBS) $(PANELCONFIG_LIBS) $(PNG_LIBS)
|
2002-11-04 09:28:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
-gladedir = $(datadir)/gnome/panel
|
|
|
|
|
+gladedir = $(datadir)/gnome/panel2
|
|
|
|
|
glade_DATA = gnome-panel-preferences.glade gnome-panel-screenshot.glade
|
|
|
|
|
|
|
|
|
|
|
2003-02-14 22:05:27 +01:00
|
|
|
@@ -270,7 +270,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
|
2002-11-04 09:28:00 +01:00
|
|
|
CONFIG_HEADER = ../config.h
|
|
|
|
|
CONFIG_CLEAN_FILES =
|
|
|
|
|
bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-panel-preferences$(EXEEXT) \
|
|
|
|
|
-gnome-panel-screenshot$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
|
|
|
|
|
+gnome2-panel-screenshot$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
|
|
|
|
|
PROGRAMS = $(bin_PROGRAMS)
|
|
|
|
|
|
|
|
|
|
|
2003-02-14 22:05:27 +01:00
|
|
|
@@ -418,7 +418,7 @@ gnome-panel-preferences$(EXEEXT): $(gnom
|
2002-11-04 09:28:00 +01:00
|
|
|
@rm -f gnome-panel-preferences$(EXEEXT)
|
|
|
|
|
$(LINK) $(gnome_panel_preferences_LDFLAGS) $(gnome_panel_preferences_OBJECTS) $(gnome_panel_preferences_LDADD) $(LIBS)
|
|
|
|
|
|
|
|
|
|
-gnome-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES)
|
|
|
|
|
+gnome2-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES)
|
2003-02-14 22:05:27 +01:00
|
|
|
@rm -f gnome-panel-screenshot$(EXEEXT)
|
2002-11-04 09:28:00 +01:00
|
|
|
$(LINK) $(gnome_panel_screenshot_LDFLAGS) $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_LDADD) $(LIBS)
|
|
|
|
|
|
