2000-02-23 00:06:06 +00:00
|
|
|
--- Makefile.in.orig Tue Feb 22 00:06:41 2000
|
|
|
|
+++ Makefile.in Tue Feb 22 11:13:20 2000
|
|
|
|
@@ -134,7 +134,7 @@
|
1999-10-14 05:03:17 +00:00
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
SUBDIRS = po intl idl libefs bonobo storage-modules components samples gshell tools tests
|
1999-10-14 05:03:17 +00:00
|
|
|
|
|
|
|
-confexecdir = $(libdir)
|
|
|
|
+confexecdir = $(sysconfdir)
|
|
|
|
confexec_DATA = bonoboConf.sh
|
|
|
|
|
|
|
|
EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in
|
2000-04-21 16:09:42 +00:00
|
|
|
--- components/application-x-gnomine/Makefile.in.orig Sun Mar 26 10:16:13 2000
|
|
|
|
+++ components/application-x-gnomine/Makefile.in Fri Apr 21 10:18:21 2000
|
|
|
|
@@ -133,9 +133,9 @@
|
1999-10-14 05:03:17 +00:00
|
|
|
l = @l@
|
|
|
|
|
|
|
|
scoredir = $(localstatedir)/games
|
|
|
|
-Gamesdir = $(datadir)/gnome/apps/Games
|
|
|
|
+Gamesdir = $(datadir)/apps/Games
|
|
|
|
|
2000-04-21 16:09:42 +00:00
|
|
|
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/bonobo -I$(top_builddir)/bonobo -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
|
|
|
|
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/bonobo -I$(top_builddir)/bonobo -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
|
1999-10-14 05:03:17 +00:00
|
|
|
|
2000-04-21 16:09:42 +00:00
|
|
|
|
|
|
|
#bin_PROGRAMS = gnomine bonobo-application-x-mines
|
2000-02-23 00:06:06 +00:00
|
|
|
@@ -163,12 +163,14 @@
|
2000-02-14 19:16:38 +00:00
|
|
|
EXTRA_DIST = flag.xpm mine.xpm face-cool.xpm face-sad.xpm face-smile.xpm face-win.xpm face-worried.xpm gnomine.desktop README AUTHORS $(gnorba_DATA)
|
|
|
|
|
|
|
|
|
|
|
|
-Games_DATA = gnomine.desktop
|
|
|
|
+Games_DATA = gnomine-bonobo.desktop
|
|
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
|
|
CONFIG_HEADER = ../../config.h
|
|
|
|
CONFIG_CLEAN_FILES =
|
|
|
|
PROGRAMS = $(bin_PROGRAMS)
|
|
|
|
|
|
|
|
+gnomine-bonobo.desktop: gnomine.desktop
|
|
|
|
+ cp gnomine.desktop gnomine-bonobo.desktop
|
|
|
|
|
|
|
|
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
|
|
|
|
LIBS = @LIBS@
|
2000-02-23 00:06:06 +00:00
|
|
|
--- components/audio-ulaw/Makefile.in.orig Tue Feb 22 00:06:59 2000
|
|
|
|
+++ components/audio-ulaw/Makefile.in Tue Feb 22 11:15:23 2000
|
|
|
|
@@ -139,7 +139,7 @@
|
1999-10-14 05:03:17 +00:00
|
|
|
bonobo_audio_ulaw_SOURCES = bonobo-audio-ulaw.c bonobo-audio-ulaw.h item-audio.c item-audio.h color.c color.h
|
|
|
|
|
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
1999-10-14 05:03:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
bonobo_audio_ulaw_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS)
|
2000-02-23 00:06:06 +00:00
|
|
|
--- components/image-x-png/Makefile.in.orig Tue Feb 22 00:06:54 2000
|
|
|
|
+++ components/image-x-png/Makefile.in Tue Feb 22 11:16:15 2000
|
|
|
|
@@ -132,14 +132,14 @@
|
1999-10-14 05:03:17 +00:00
|
|
|
cxxflags_set = @cxxflags_set@
|
|
|
|
l = @l@
|
|
|
|
|
|
|
|
-SUBDIRS = doc
|
|
|
|
+SUBDIRS = # doc
|
|
|
|
|
|
|
|
bin_PROGRAMS = bonobo-image-x-png
|
|
|
|
|
|
|
|
bonobo_image_x_png_SOURCES = bonobo-image-x-png.c
|
|
|
|
|
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
1999-10-14 05:03:17 +00:00
|
|
|
|
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
bonobo_image_x_png_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) -lpng -lz
|
|
|
|
--- components/text-plain/Makefile.in.orig Tue Feb 22 00:06:58 2000
|
|
|
|
+++ components/text-plain/Makefile.in Tue Feb 22 11:16:45 2000
|
|
|
|
@@ -137,7 +137,7 @@
|
1999-10-14 05:03:17 +00:00
|
|
|
bonobo_text_plain_SOURCES = bonobo-text-plain.c
|
|
|
|
|
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
1999-10-14 05:03:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
bonobo_text_plain_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS)
|
2000-02-23 00:06:06 +00:00
|
|
|
--- samples/compound-doc/Makefile.in.orig Tue Feb 22 00:07:03 2000
|
|
|
|
+++ samples/compound-doc/Makefile.in Tue Feb 22 11:17:13 2000
|
|
|
|
@@ -134,7 +134,7 @@
|
|
|
|
@OAF_TRUE@bin_PROGRAMS =
|
|
|
|
@OAF_FALSE@bin_PROGRAMS = paint-component-simple sample-container
|
1999-10-14 05:03:17 +00:00
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
1999-10-14 05:03:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
paint_component_simple_SOURCES = paint-component-simple.c
|
2000-02-23 00:06:06 +00:00
|
|
|
--- samples/controls/Makefile.in.orig Tue Feb 22 00:07:02 2000
|
|
|
|
+++ samples/controls/Makefile.in Tue Feb 22 11:17:36 2000
|
|
|
|
@@ -134,7 +134,7 @@
|
|
|
|
@OAF_TRUE@bin_PROGRAMS =
|
|
|
|
@OAF_FALSE@bin_PROGRAMS = sample-control-factory sample-control-container
|
2000-01-28 18:37:19 +00:00
|
|
|
|
2000-02-23 00:06:06 +00:00
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
2000-01-28 18:37:19 +00:00
|
|
|
|
|
|
|
|
|
|
|
sample_control_factory_SOURCES = bonobo-clock-control.c bonobo-clock-control.h bonobo-calculator-control.c bonobo-calculator-control.h sample-control-factory.c
|
2000-02-23 00:06:06 +00:00
|
|
|
--- storage-modules/Makefile.in.orig Tue Feb 22 00:06:50 2000
|
|
|
|
+++ storage-modules/Makefile.in Tue Feb 22 11:22:05 2000
|
|
|
|
@@ -132,7 +132,7 @@
|
1999-10-14 05:03:17 +00:00
|
|
|
cxxflags_set = @cxxflags_set@
|
|
|
|
l = @l@
|
|
|
|
|
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libefs/src -I$(includedir) $(GNOME_INCLUDEDIR)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libefs/src -I$(includedir) $(GNOME_INCLUDEDIR)
|
|
|
|
|
|
|
|
|
|
|
|
common_ldflags = -avoid-version
|
2000-02-23 00:06:06 +00:00
|
|
|
--- po/Makefile.in.in.orig Mon Feb 21 23:37:16 2000
|
|
|
|
+++ po/Makefile.in.in Tue Feb 22 11:18:13 2000
|
1999-10-14 05:03:17 +00:00
|
|
|
@@ -18,8 +18,8 @@
|
|
|
|
|
|
|
|
prefix = @prefix@
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
-datadir = $(prefix)/@DATADIRNAME@
|
|
|
|
-localedir = $(datadir)/locale
|
|
|
|
+datadir = $(prefix)/share/locale
|
|
|
|
+localedir = $(prefix)/share/locale
|
|
|
|
gnulocaledir = $(prefix)/share/locale
|
|
|
|
gettextsrcdir = $(prefix)/share/gettext/po
|
|
|
|
subdir = po
|
2000-02-23 00:06:06 +00:00
|
|
|
--- libefs/Makefile.in.orig Tue Feb 22 00:06:43 2000
|
|
|
|
+++ libefs/Makefile.in Tue Feb 22 11:18:33 2000
|
|
|
|
@@ -77,7 +77,7 @@
|
|
|
|
RANLIB = @RANLIB@
|
1999-10-14 05:03:17 +00:00
|
|
|
VERSION = @VERSION@
|
|
|
|
|
|
|
|
-SUBDIRS = src doc
|
|
|
|
+SUBDIRS = src # doc
|
|
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
|
|
|
CONFIG_HEADER = config.h
|
2000-04-21 16:09:42 +00:00
|
|
|
--- bonobo/Makefile.in.orig Sun Mar 26 10:16:10 2000
|
|
|
|
+++ bonobo/Makefile.in Fri Apr 21 10:08:50 2000
|
|
|
|
@@ -140,7 +140,7 @@
|
|
|
|
@OAF_TRUE@OBJECT_DIRECTORY_IMPL = bonobo-object-directory-oaf.c
|
|
|
|
@OAF_FALSE@OBJECT_DIRECTORY_IMPL = bonobo-object-directory-goad.c
|
|
|
|
|
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I. -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I. -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR)
|
|
|
|
|
|
|
|
|
|
|
|
gnome_libs = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(OBJECT_DIRECTORY_LIBS) $(INTLLIBS)
|
|
|
|
--- gshell/Makefile.in.orig Sun Mar 26 10:16:20 2000
|
|
|
|
+++ gshell/Makefile.in Fri Apr 21 10:19:33 2000
|
|
|
|
@@ -132,7 +132,7 @@
|
|
|
|
cxxflags_set = @cxxflags_set@
|
|
|
|
l = @l@
|
|
|
|
|
|
|
|
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/bonobo -I$(top_builddir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/bonobo -I$(top_builddir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
|
|
|
|
@OAF_TRUE@bin_PROGRAMS =
|
|
|
|
@OAF_FALSE@bin_PROGRAMS = gshell
|
|
|
|
--- tests/Makefile.in.orig Sun Mar 26 10:16:23 2000
|
|
|
|
+++ tests/Makefile.in Fri Apr 21 10:20:48 2000
|
|
|
|
@@ -134,7 +134,7 @@
|
|
|
|
@OAF_TRUE@bin_PROGRAMS =
|
|
|
|
@OAF_FALSE@bin_PROGRAMS = test-properties-server test-properties-client
|
|
|
|
|
|
|
|
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_srcdir)/bonobo -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
|
|
|
|
|
|
|
|
|
|
|
|
test_properties_server_SOURCES = test-properties-server.c
|