summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am36
1 files changed, 12 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e10e7edef..b1d13fd07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,14 @@
include $(top_srcdir)/Makefile.shared
+AUTOMAKE_OPTIONS = subdir-objects
+
bin_PROGRAMS= \
nautilus \
- nautilus-desktop \
nautilus-autorun-software \
$(NULL)
+noinst_LTLIBRARIES=libnautilus.la
+
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libnautilus-private \
@@ -26,6 +29,10 @@ AM_CPPFLAGS = \
$(NULL)
LDADD =\
+ $(top_builddir)/src/libnautilus.la \
+ $(NULL)
+
+libnautilus_la_LIBADD =\
$(top_builddir)/libnautilus-private/libnautilus-private.la \
$(top_builddir)/libgd/libgd.la \
$(BASE_LIBS) \
@@ -150,16 +157,8 @@ nautilus_no_main_sources = \
nautilus-canvas-view-container.h \
nautilus-dbus-manager.c \
nautilus-dbus-manager.h \
- nautilus-desktop-canvas-view.c \
- nautilus-desktop-canvas-view.h \
- nautilus-desktop-canvas-view-container.c \
- nautilus-desktop-canvas-view-container.h \
nautilus-desktop-item-properties.c \
nautilus-desktop-item-properties.h \
- nautilus-desktop-window.c \
- nautilus-desktop-window.h \
- nautilus-desktop-window-slot.c \
- nautilus-desktop-window-slot.h \
nautilus-error-reporting.c \
nautilus-error-reporting.h \
nautilus-preferences-window.c \
@@ -227,24 +226,13 @@ nautilus_no_main_sources = \
nautilus-x-content-bar.h \
$(NULL)
-nautilus_SOURCES = \
- $(nautilus_no_main_sources) \
- nautilus-main.c \
- $(NULL)
-
-nautilus_desktop_SOURCES= \
- $(nautilus_no_main_sources) \
- main-desktop.c \
- nautilus-desktop-application.c \
- nautilus-desktop-application.h \
- $(NULL)
-
-nodist_nautilus_SOURCES = \
+nodist_libnautilus_la_SOURCES = \
$(nautilus_built_sources) \
+ $(nautilus_no_main_sources) \
$(NULL)
-nodist_nautilus_desktop_SOURCES = \
- $(nautilus_built_sources) \
+nautilus_SOURCES = \
+ nautilus-main.c \
$(NULL)
EMPTY_VIEW_SOURCES = \