Commit bc22620f authored by Gene Z. Ragan's avatar Gene Z. Ragan Committed by Gene Ragan

Change makefiles to link against libnautilus. This is so calls to the undo

2000-05-11  Gene Z. Ragan  <gzr@eazel.com>

	* helper-utilities/authenticate/Makefile.am:
	* nautilus-widgets/Makefile.am:
	* libnautilus-extensions/Makefile.am:
	* libnautilus/Makefile.am:
	Change makefiles to link against libnautilus.  This is so calls
	to the undo manager code resolve.  There is probably a better way to
	do this.

	* libnautilus-extensions/nautilus-entry.c:
	* libnautilus-extensions/nautilus-icon-container.c:
	* libnautilus-extensions/nautilus-icon-text-item.c:
	* src/nautilus-bookmarks-window.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-window-menus.c:
	* src/ntl-app.c:
	Changed to #include <libnautilus-extensions/nautilus-undo-manager.h>
	to #include <libnautilus/nautilus-undo-manager.h>
parent a0691399
2000-05-11 Gene Z. Ragan <gzr@eazel.com>
* helper-utilities/authenticate/Makefile.am:
* nautilus-widgets/Makefile.am:
* libnautilus-extensions/Makefile.am:
* libnautilus/Makefile.am:
Change makefiles to link against libnautilus. This is so calls
to the undo manager code resolve. There is probably a better way to
do this.
* libnautilus-extensions/nautilus-entry.c:
* libnautilus-extensions/nautilus-icon-container.c:
* libnautilus-extensions/nautilus-icon-text-item.c:
* src/nautilus-bookmarks-window.c:
* src/nautilus-location-bar.c:
* src/nautilus-window-menus.c:
* src/ntl-app.c:
Changed to #include <libnautilus-extensions/nautilus-undo-manager.h>
to #include <libnautilus/nautilus-undo-manager.h>
2000-05-10 Gene Z. Ragan <gzr@eazel.com>
*libnautilus/nautilus-undo-manager-component.idl
......@@ -9,7 +29,7 @@
*libnautilus/nautilus-undoable.c
*libnautilus/nautilus-undoable.h
Moved files to libnautilus so IDL comiplation would work properly
Moved files to libnautilus so IDL compilation would work properly
and at the suggestion of mjs.
*libnautilus-extensions/Makefile.am
......
......@@ -26,4 +26,5 @@ nautilus_authenticate_LDFLAGS = \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \
$(PAM_LIBS) \
$(top_builddir)/libnautilus/libnautilus.la \
$(NULL)
......@@ -19,11 +19,12 @@ libnautilus_extensions_la_LDFLAGS=\
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG)
$(LIBPNG) \
$(top_src_dir)/libnautilus/.libs/libnautilus.so
fsextension_idl_sources = \
fsextension-stubs.c \
fsextension-skels.c \
fsextension-skels.c \
fsextension-common.c \
fsextension.h
......@@ -73,7 +74,7 @@ libnautilus_extensionsinclude_HEADERS= \
nautilus-xml-extensions.h \
$(NULL)
libnautilus_extensions_la_SOURCES = \
libnautilus_extensions_la_SOURCES = \
nautilus-file-changes-queue-private.h \
nautilus-icon-private.h \
nautilus-file-private.h \
......@@ -117,7 +118,7 @@ libnautilus_extensions_la_SOURCES = \
nautilus-string-list.c \
nautilus-string.c \
nautilus-xml-extensions.c \
$(fsextension_idl_sources) \
$(fsextension_idl_sources) \
$(NULL)
$(fsextension_idl_sources): fsextension_idl_stamp
......
......@@ -28,7 +28,7 @@
#include "nautilus-entry.h"
#include "nautilus-gtk-macros.h"
#include "libnautilus-extensions/nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
......
......@@ -35,6 +35,7 @@
#include <gtk/gtkmain.h>
#include <libgnomeui/gnome-canvas-rect-ellipse.h>
#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
#include <libnautilus/nautilus-undo-manager.h>
#include "nautilus-gdk-pixbuf-extensions.h"
#include "nautilus-glib-extensions.h"
......@@ -44,7 +45,7 @@
#include "nautilus-gtk-macros.h"
#include "nautilus-icon-text-item.h"
#include "nautilus-lib-self-check-functions.h"
#include "nautilus-undo-manager.h"
#include "nautilus-icon-grid.h"
#include "nautilus-icon-private.h"
......
......@@ -12,7 +12,7 @@
#include "nautilus-icon-text-item.h"
#include "nautilus-entry.h"
#include "nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <math.h>
#include <stdio.h>
......
......@@ -19,11 +19,12 @@ libnautilus_extensions_la_LDFLAGS=\
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG)
$(LIBPNG) \
$(top_src_dir)/libnautilus/.libs/libnautilus.so
fsextension_idl_sources = \
fsextension-stubs.c \
fsextension-skels.c \
fsextension-skels.c \
fsextension-common.c \
fsextension.h
......@@ -73,7 +74,7 @@ libnautilus_extensionsinclude_HEADERS= \
nautilus-xml-extensions.h \
$(NULL)
libnautilus_extensions_la_SOURCES = \
libnautilus_extensions_la_SOURCES = \
nautilus-file-changes-queue-private.h \
nautilus-icon-private.h \
nautilus-file-private.h \
......@@ -117,7 +118,7 @@ libnautilus_extensions_la_SOURCES = \
nautilus-string-list.c \
nautilus-string.c \
nautilus-xml-extensions.c \
$(fsextension_idl_sources) \
$(fsextension_idl_sources) \
$(NULL)
$(fsextension_idl_sources): fsextension_idl_stamp
......
......@@ -28,7 +28,7 @@
#include "nautilus-entry.h"
#include "nautilus-gtk-macros.h"
#include "libnautilus-extensions/nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
......
......@@ -35,6 +35,7 @@
#include <gtk/gtkmain.h>
#include <libgnomeui/gnome-canvas-rect-ellipse.h>
#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
#include <libnautilus/nautilus-undo-manager.h>
#include "nautilus-gdk-pixbuf-extensions.h"
#include "nautilus-glib-extensions.h"
......@@ -44,7 +45,7 @@
#include "nautilus-gtk-macros.h"
#include "nautilus-icon-text-item.h"
#include "nautilus-lib-self-check-functions.h"
#include "nautilus-undo-manager.h"
#include "nautilus-icon-grid.h"
#include "nautilus-icon-private.h"
......
......@@ -12,7 +12,7 @@
#include "nautilus-icon-text-item.h"
#include "nautilus-entry.h"
#include "nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <math.h>
#include <stdio.h>
......
......@@ -66,7 +66,7 @@ libnautilus_la_SOURCES= \
nautilus-zoomable.c \
nautilus-undo-manager.c \
nautilus-undo-transaction.c \
nautilus-undoable.c \
nautilus-undoable.c \
$(NULL)
$(nautilus_undo_manager_component_idl_sources): nautilus_undo_manager_component_idl_stamp
......@@ -81,4 +81,4 @@ nautilus_view_component_idl_stamp: nautilus-view-component.idl
CLEANFILES=nautilus_view_component_idl_stamp nautilus_undo_manager_component_idl_stamp
EXTRA_DIST = nautilus-view-component.idl
EXTRA_DIST = nautilus-undo-manager-component.idl nautilus-view-component.idl
......@@ -2,11 +2,6 @@ NULL=
bin_PROGRAMS = test-nautilus-widgets
test_nautilus_widgets_LDADD =\
libnautilus-widgets.la \
$(GNOMEUI_LIBS) \
$(NULL)
lib_LTLIBRARIES=libnautilus-widgets.la
INCLUDES =\
......@@ -19,7 +14,8 @@ INCLUDES =\
$(NULL)
libnautilus_widgets_la_LDFLAGS=\
$(GNOME_LIBS)
$(GNOME_LIBS) \
$(top_src_dir)/libnautilus/libnautilus.la
libnautilus_widgetsincludedir=$(includedir)/nautilus-widgets
......@@ -57,8 +53,10 @@ test_nautilus_widgets_SOURCES =\
test_nautilus_widgets_LDADD =\
$(GCONF_LIBS) \
$(GNOMEUI_LIBS) \
../nautilus-widgets/libnautilus-widgets.la \
../libnautilus-extensions/libnautilus-extensions.la \
../libnautilus/libnautilus.la \
../librsvg/librsvg.la \
$(NULL)
......
......@@ -32,7 +32,7 @@
#include "file-manager/fm-list-view.h"
#include <libgnomevfs/gnome-vfs-init.h>
#include <libnautilus-extensions/nautilus-global-preferences.h>
#include <libnautilus-extensions/nautilus-undo-manager.h>
#include <libnautilus/nautilus-undo-manager.h>
typedef struct {
POA_Nautilus_Application servant;
......
......@@ -24,7 +24,7 @@
#include <config.h>
#include "nautilus-bookmarks-window.h"
#include "libnautilus-extensions/nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <libnautilus-extensions/nautilus-entry.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
......
......@@ -43,7 +43,7 @@
#include <libnautilus-extensions/nautilus-string.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-undo-manager.h>
#include <libnautilus/nautilus-undo-manager.h>
#define NAUTILUS_DND_URI_LIST_TYPE "text/uri-list"
#define NAUTILUS_DND_TEXT_PLAIN_TYPE "text/plain"
......
......@@ -32,7 +32,7 @@
#include "ntl-window-private.h"
#include "nautilus-property-browser.h"
#include "libnautilus-extensions/nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <libnautilus/nautilus-bonobo-ui.h>
......
......@@ -32,7 +32,7 @@
#include "ntl-window-private.h"
#include "nautilus-property-browser.h"
#include "libnautilus-extensions/nautilus-undo-manager.h"
#include <libnautilus/nautilus-undo-manager.h>
#include <libnautilus/nautilus-bonobo-ui.h>
......
......@@ -32,7 +32,7 @@
#include "file-manager/fm-list-view.h"
#include <libgnomevfs/gnome-vfs-init.h>
#include <libnautilus-extensions/nautilus-global-preferences.h>
#include <libnautilus-extensions/nautilus-undo-manager.h>
#include <libnautilus/nautilus-undo-manager.h>
typedef struct {
POA_Nautilus_Application servant;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment