Index: gedit/Makefile.am
===================================================================
RCS file: /cvs/gnome/gedit/gedit/Makefile.am,v
retrieving revision 1.111.2.37
diff -u -p -r1.111.2.37 Makefile.am
--- gedit/Makefile.am	11 Dec 2005 20:42:23 -0000	1.111.2.37
+++ gedit/Makefile.am	11 Dec 2005 22:52:13 -0000
@@ -24,13 +24,8 @@ INCLUDES += \
 	$(AM_CFLAGS)
 endif
 
-noinst_LTLIBRARIES = libgedit.la
-
-gedit_LDFLAGS = -export-dynamic
-
 gedit_LDADD =				\
 	$(GEDIT_LIBS)			\
-	libgedit.la			\
 	dialogs/libdialogs.la		\
 	recent-files/librecent.la
 
@@ -62,108 +57,98 @@ NOINST_H_FILES =			\
 
 if ENABLE_PYTHON
 NOINST_H_FILES += \
-	gedit-python-module.h \
+	gedit-python-module.h		\
 	gedit-python-plugin.h 
 endif
 
 INST_H_FILES =				\
-	gedit-utils.h 			\
-	gedit-help.h 			\
+	gedit-app.h			\
+	gedit-convert.h			\
+	gedit-debug.h			\
 	gedit-document.h 		\
-	gedit-view.h 			\
-	gedit-tab.h 			\
-	gedit-notebook.h		\
-	gedit-prefs-manager-app.h	\
-	gedit-recent.h			\
-	gedit-window.h			\
-	gedit-panel.h			\
-	gedit-statusbar.h		\
-	gedit-print.h			\
+	gedit-encodings.h		\
 	gedit-encodings-option-menu.h	\
 	gedit-file-chooser-dialog.h	\
+	gedit-help.h 			\
 	gedit-message-area.h		\
-	gedit-print-job-preview.h	\
-	gedit-progress-message-area.h	\
+	gedit-metadata-manager.h	\
+	gedit-notebook.h		\
+	gedit-panel.h			\
 	gedit-plugin.h			\
-	gedit-app.h
-
-
-LIB_H_FILES =				\
-	gedit-encodings.h		\
-	gedit-convert.h			\
-	gedit-debug.h			\
+	gedit-prefs-manager-app.h	\
 	gedit-prefs-manager.h		\
-	gedit-metadata-manager.h	
-
+	gedit-print.h			\
+	gedit-print-job-preview.h	\
+	gedit-progress-message-area.h	\
+	gedit-recent.h			\
+	gedit-statusbar.h		\
+	gedit-tab.h 			\
+	gedit-utils.h 			\
+	gedit-view.h 			\
+	gedit-window.h
 
 headerdir = $(prefix)/include/gedit-@GEDIT_MAJOR@/gedit
 
 header_DATA = 				\
-	$(INST_H_FILES)			\
-	$(LIB_H_FILES)
+	$(INST_H_FILES)	
 
 gedit_SOURCES = 			\
 	$(BUILT_SOURCES)		\
 	$(BACON_FILES)			\
 	gedit.c				\
-	gedit-commands-file.c		\
+	gedit-app.c			\
 	gedit-commands-documents.c	\
 	gedit-commands-edit.c		\
+	gedit-commands-file.c		\
 	gedit-commands-file-print.c	\
 	gedit-commands-help.c		\
 	gedit-commands-search.c		\
 	gedit-commands-view.c		\
+	gedit-convert.c			\
+	gedit-debug.c			\
 	gedit-document.c 		\
-	gedit-view.c 			\
-	gedit-tab.c 			\
-	gedit-notebook.c		\
-	gedit-prefs-manager-app.c	\
-	gedit-tooltips.c		\
-	gedit-window.c			\
-	gedit-panel.c			\
-	gedit-statusbar.c		\
-	gedit-utils.c 			\
-	gedit-help.c			\
-	gedit-languages-manager.c	\
-	gedit-print.c			\
-	gedit-recent.c			\
-	gedit-app.c			\
-	gedit-documents-panel.c		\
 	gedit-document-loader.c		\
 	gedit-document-saver.c		\
-	gedit-file-chooser-dialog.c	\
+	gedit-documents-panel.c		\
+	gedit-encodings.c		\
 	gedit-encodings-option-menu.c	\
-	gedit-message-area.c		\
+	gedit-file-chooser-dialog.c	\
+	gedit-help.c			\
 	gedit-io-error-message-area.c	\
-	gedit-print-job-preview.c	\
-	gedit-progress-message-area.c	\
-	gedit-plugin.c			\
+	gedit-languages-manager.c	\
+	gedit-message-area.c		\
+	gedit-metadata-manager.c	\
 	gedit-module.c			\
-	gedit-plugins-engine.c		\
+	gedit-notebook.c		\
+	gedit-panel.c			\
+	gedit-plugin.c			\
 	gedit-plugin-manager.c		\
-	gedit-spinner.c			\
+	gedit-plugins-engine.c		\
+	gedit-prefs-manager-app.c	\
+	gedit-prefs-manager.c		\
+	gedit-prefs-manager-private.h	\
+	gedit-print.c			\
+	gedit-print-job-preview.c	\
+	gedit-progress-message-area.c	\
+	gedit-recent.c			\
 	gedit-session.c			\
+	gedit-spinner.c			\
+	gedit-statusbar.c		\
+	gedit-tab.c 			\
+	gedit-tooltips.c		\
+	gedit-utils.c 			\
+	gedit-view.c 			\
+	gedit-window.c			\
 	sexy-icon-entry.c		\
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
 
 
-libgedit_la_SOURCES = 			\
-	gedit-debug.c			\
-	gedit-convert.c			\
-	gedit-encodings.c		\
-	gedit-prefs-manager.c		\
-	gedit-prefs-manager-private.h	\
-	gedit-metadata-manager.c	\
-	gedit-encodings.c		\
-	gedit-convert.c			\
-	$(LIB_H_FILES)
-
 if ENABLE_PYTHON
-libgedit_la_SOURCES += \
-	gedit-python-module.c	\
-	gedit-python-module.h	\
-	gedit-python-plugin.c	\
+gedit_SOURCES += \
+	gedit-python-module.c		\
+	gedit-python-module.h		\
+	gedit-python-plugin.c		\
 	gedit-python-plugin.h	
 endif