From 3e320e6748cf5d32db423b564b5e6ca45f7ab1cc Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 14 Sep 2000 17:17:46 +0000
Subject: [PATCH] * Makefile.in: Don't make softlinks to the libraries

---
 gnome/ChangeLog   |  4 ++++
 gnome/Makefile.in | 16 +++-------------
 src/ChangeLog     |  4 ++++
 src/Makefile.in   | 19 +------------------
 4 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 1f4de1210..60ff4d5b3 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-14  Pavel Roskin  <proski@gnu.org>
+
+	* Makefile.in: Don't make softlinks to the libraries
+
 2000-09-12  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* glayout.c (run_cmd): Memory leak fix: cmd released after use
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index 012d9fca3..b4b4bd3a4 100644
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -269,10 +269,10 @@ mx: checklinks
 	@echo -----------------------------------------------------------
 	@touch mx
 
-plain-gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) libgtkedit.a
+plain-gmc: $(OBJS) $(NORMALOBJS)
 	$(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
 
-corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) libgtkedit.a
+corba-gmc: $(OBJS) $(CORBAOBJS)
 	$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS)
 
 gmc-client: $(CLIENTOBJS)
@@ -287,16 +287,6 @@ mc.keys: mc.keys.in Makefile
 mc.keys.in: mc.keys.in.in Makefile.in ../config.status
 	(cd ..; CONFIG_FILES=gnome/mc.keys.in CONFIG_HEADERS= ./config.status)
 
-@LIBVFS@:
-	cd ../vfs; $(MAKE) @LIBVFS@
-@PCENTRULE@	$(RMF) @LIBVFS@
-@PCENTRULE@	$(LN_S) ../vfs/@LIBVFS@ .
-
-libgtkedit.a:
-	cd ../gtkedit; $(MAKE) libgtkedit.a
-@PCENTRULE@	$(RMF) libgtkedit.a
-@PCENTRULE@	$(LN_S) ../gtkedit/libgtkedit.a .
-
 checklinks:
 	@if test -f $(gnomedir)/regex.c; then echo ok; \
 	else $(MAKE) sourcelinks; fi
@@ -320,7 +310,7 @@ TAGS: $(GNOMESRCS)
 	etags $(GNOMESRCS)
 
 clean:
-	$(RMF) plain-gmc corba-gmc *.o core a.out mx @LIBVFS@ libgtkedit.a $(CORBA_GENERATED)
+	$(RMF) plain-gmc corba-gmc *.o core a.out mx $(CORBA_GENERATED)
 
 realclean: clean
 	$(RMF) .depend
diff --git a/src/ChangeLog b/src/ChangeLog
index 9fd9df1f7..0d9a679c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-14  Pavel Roskin  <proski@gnu.org>
+
+	* Makefile.in: Don't make softlinks to the libraries
+
 2000-09-13  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.in: Only rebuild mc.hlp in the maintainer mode.
diff --git a/src/Makefile.in b/src/Makefile.in
index 22ab61e05..0e5a03e43 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -72,27 +72,12 @@ cons.saver: cons.saver.o
 check:
 	@echo no tests are supplied.
 
-mc: $(OBJS) @LIBVFS@ @LIBSLANG@ @LIBEDIT_A@
+mc: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) -L../vfs -L../slang -L../edit $(OURLIBS) $(LIBS) 
 
 mcmfmt: mfmt.o
 	$(CC) $(LDFLAGS) mfmt.o -o mcmfmt 
 
-libvfs-mc.a:
-	cd ../vfs; $(MAKE) libvfs-mc.a
-@PCENTRULE@	$(RMF) libvfs-mc.a
-@PCENTRULE@	$(LN_S) ../vfs/libvfs-mc.a .
-
-libmcslang.a:
-	cd ../slang; $(MAKE) libmcslang.a
-@PCENTRULE@	$(RMF) libmcslang.a
-@PCENTRULE@	$(LN_S) ../slang/libmcslang.a .
-
-libedit.a:
-	cd ../edit; $(MAKE) libedit.a
-@PCENTRULE@	$(RMF) libedit.a
-@PCENTRULE@	$(LN_S) ../edit/libedit.a .
-
 $(srcdir)/mc.hlp: @MAINT@ $(docdir)/mc.1.in $(mcsrclibdir)/xnc.hlp $(srcdir)/gindex.pl man2hlp.c
 @MAINT@	$(MAKE) man2hlp
 @MAINT@	- ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mcsrclibdir)/xnc.hlp | \
@@ -111,7 +96,6 @@ TAGS: $(SRCS)
 
 clean:
 	$(RMF) mc cons.saver man2hlp fixhlp *.o core a.out mc.html mcmfmt
-	$(RMF) libvfs-mc.a libedit.a libmcslang.a
 
 realclean: clean
 	$(RMF) .depend
@@ -122,7 +106,6 @@ distclean:
 	$(RMF) $(srcdir)/*~ $(srcdir)/mc $(srcdir)/cons.saver
 	$(RMF) $(srcdir)/man2hlp $(srcdir)/fixhlp $(srcdir)/*.o $(srcdir)/core
 	$(RMF) $(srcdir)/a.out $(srcdir)/mc.html
-	$(RMF) $(srcdir)/libvfs-mc.a $(srcdir)/libmcslang.a $(srcdir)/libedit.a
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
 	$(RMF) $(srcdir)/Makefile