* Makefile.in: Compile our own mad.o. Don't link object files.

Put links to the build directory. Don't link headers, change
includes accordingly. gdialogs.o removed from OOBJS. Link
only sources we need. Obsolete comments removed or updated.

gnome/ChangeLog

@@ -1,5 +1,10 @@
 2000-09-14  Pavel Roskin  <proski@gnu.org>
 
+	* Makefile.in: Compile our own mad.o. Don't link object files.
+	Put links to the build directory. Don't link headers, change
+	includes accordingly. gdialogs.o removed from OOBJS. Link
+	only sources we need. Obsolete comments removed or updated.
+
 	* Makefile.in: Don't make softlinks to the libraries
 
 2000-09-12  Andrew V. Samoilov  <sav@bcs.zp.ua>

gnome/Makefile.in

@@ -7,14 +7,8 @@ top_srcdir = $(srcdir)/..
 
 GNOMEDEFS     = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@
 
-#
-# Warning: Don't add `-I$(top_srcdir)/src' to CFLAGS -- it breaks compilation
-# on glibc2.1 systems because glibc includes src/features.h instead of it's
-# own features.h. Run `make cleansourcelinks; make sourcelinks'/modify targets
-# cleansourcelinks/sourclinks in case mc doesn't find it's include files.
-#
-CFLAGS        = -g $(XCFLAGS) @X_CFLAGS@ -I.
-CPPFLAGS      = $(XCPPFLAGS) -I$(vfsdir) $(GNOMEDEFS)
+CFLAGS        = -g $(XCFLAGS) @X_CFLAGS@
+CPPFLAGS      = $(XCPPFLAGS) -I. -I$(gnomedir) -I$(mcsrcdir) $(GNOMEDEFS)
 LDFLAGS       = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@
 DEFS = $(XDEFS)
@@ -128,12 +122,7 @@ ICONS = 			\
 	i-zipdisk2.png
 
 #
-# These objects from ../src do not depend on HAVE_X / HAVE_GNOME??
-#
-LOBJS = mad.o
-
-#
-# These objects from ../src do depend on HAVE_GNOME
+# These objects are made from sources in ../src
 #
 OOBJS = dlg.o screen.o widget.o wtools.o boxes.o		\
 	file.o find.o dialog.o key.o view.o			\
@@ -141,8 +130,8 @@ OOBJS = dlg.o screen.o widget.o wtools.o boxes.o		\
 	win.o color.o profile.o user.o ext.o setup.o		\
 	subshell.o terms.o fsusage.o mountlist.o		\
 	regex.o complete.o command.o				\
-	cmd.o utilunix.o xslint.o gdialogs.o filenot.o		\
-	fileopctx.o treestore.o
+	cmd.o utilunix.o xslint.o filenot.o			\
+	fileopctx.o treestore.o mad.o
 
 CORBAOBJS = 			\
 	main-corba.o		\
@@ -155,13 +144,13 @@ CORBAOBJS = 			\
 	FileManager-common.o
 
 OBJS =						\
-	$(LOBJS)				\
 	$(OOBJS)				\
 	gaction.o				\
 	gcache.o				\
 	gcliplabel.o				\
 	gcmd.o					\
 	gcustom-layout.o			\
+	gdialogs.o				\
 	gdesktop-icon.o				\
 	gdesktop-init.o				\
 	gdesktop-prefs.o			\
@@ -288,19 +277,19 @@ mc.keys.in: mc.keys.in.in Makefile.in ../config.status
 	(cd ..; CONFIG_FILES=gnome/mc.keys.in CONFIG_HEADERS= ./config.status)
 
 checklinks:
-	@if test -f $(gnomedir)/regex.c; then echo ok; \
+	@if test -f regex.c; then : ; \
 	else $(MAKE) sourcelinks; fi
-	@if test -f regex.o; then echo ok; else $(MAKE) links; fi
-
-links:
-	for I in $(LOBJS); do $(RMF) $$I; $(LN_S) ../src/$$I $$I >/dev/null 2>&1; done; true
 
 sourcelinks:
-	-cd $(gnomedir); $(LN_S) ../src/*.[ch] . >/dev/null 2>&1; true
+	for i in $(OOBJS) main.o; do \
+		f=`echo $$i | sed -e 's/\\.o$$//'`.c; \
+		$(RMF) $$f; \
+		$(LN_S) $(mcsrcdir)/$$f . || exit 1; \
+	done
 
 cleansourcelinks:
-	-if test -f $(gnomedir)/regex.c; then \
-	    cd $(gnomedir); find . -lname '*.[ch]' | xargs $(RM); \
+	-if test -f regex.c; then \
+	    find . -lname '*.c' | xargs $(RMF); \
 	fi
 
 check: