blob: 9239f9b4f9c0212597a6d7fdc4033001be5d458b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
$NetBSD: patch-ae,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $
--- gnome-panel/Makefile.in.orig Mon Oct 14 11:21:55 2002
+++ gnome-panel/Makefile.in
@@ -152,7 +152,7 @@ AUTOMAKE_OPTIONS = 1.3
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:
@@ -168,7 +168,7 @@ DISABLE_DEPRECATED_CFLAGS = -DG_DISABL
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)
@@ -219,7 +219,7 @@ gnome_panel_screenshot_LDFLAGS = -export
gnome_panel_screenshot_LDADD = $(X_LIBS) $(PANELCONFIG_LIBS) $(PNG_LIBS)
-gladedir = $(datadir)/gnome/panel
+gladedir = $(datadir)/gnome/panel2
glade_DATA = gnome-panel-preferences.glade gnome-panel-screenshot.glade
@@ -254,7 +254,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
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)
@@ -396,8 +396,8 @@ gnome-panel-preferences$(EXEEXT): $(gnom
@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)
- @rm -f gnome-panel-screenshot$(EXEEXT)
+gnome2-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES)
+ @rm -f gnome2-panel-screenshot$(EXEEXT)
$(LINK) $(gnome_panel_screenshot_LDFLAGS) $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_LDADD) $(LIBS)
gnome-desktop-item-edit$(EXEEXT): $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_DEPENDENCIES)
|
