* Make.common.in: removed hack for "make distcopy"

* doc/Makefile.in, edit/Makefile.in, gnome/Makefile.in,
gtkedit/Makefile.in, slang/Makefile.in, src/Makefile.in,
vfs/Make-mc.in: added "distdir" target. Now "make dist" works
for external builds.
* edit/Makefile.in, slang/Makefile.in: added "Makefile" target
This commit is contained in:
Pavel Roskin 2000-08-28 18:51:22 +00:00
parent fe79f3e017
commit 95b52b597c
9 changed files with 61 additions and 34 deletions

View File

@ -1,3 +1,12 @@
2000-08-28 Pavel Roskin <proski@gnu.org>
* Make.common.in: removed hack for "make distcopy"
* doc/Makefile.in, edit/Makefile.in, gnome/Makefile.in,
gtkedit/Makefile.in, slang/Makefile.in, src/Makefile.in,
vfs/Make-mc.in: added "distdir" target. Now "make dist" works
for external builds.
* edit/Makefile.in, slang/Makefile.in: added "Makefile" target
2000-08-24 Pavel Roskin <proski@gnu.org> 2000-08-24 Pavel Roskin <proski@gnu.org>
* new_icons/Makefile.in: converted to ... * new_icons/Makefile.in: converted to ...

View File

@ -110,8 +110,6 @@ slowdep: dummy
mcdep: @dep@ mcdep: @dep@
distdir: distcopy
dummy: dummy:
# End of Make.common # End of Make.common

View File

@ -80,7 +80,9 @@ realclean:
distclean: distclean:
$(RMF) $(srcdir)/*~ $(srcdir)/Makefile $(srcdir)/*.1 $(srcdir)/*.8 $(RMF) $(srcdir)/*~ $(srcdir)/Makefile $(srcdir)/*.1 $(srcdir)/*.8
distcopy: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DISTDOC); do $(CP) $(top_srcdir)/doc/$$I $(top_srcdir)/mc-$(VERSION)/doc; done
distdir:
for I in $(DISTDOC); do $(CP) $(srcdir)/$$I $(distdir); done
depend dep: depend dep:

View File

@ -27,6 +27,9 @@ DIST = Makefile.in $(EDITSRC)
all: @LIBEDIT_A@ all: @LIBEDIT_A@
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=edit/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
.c.o: .c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DMIDNIGHT $< $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DMIDNIGHT $<
@ -89,8 +92,10 @@ install: @MCEDIT@
uninstall: uninstall:
$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
distcopy: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DIST); do $(CP) $(top_srcdir)/edit/$$I $(top_srcdir)/mc-$(VERSION)/edit; done
distdir:
for I in $(DIST); do $(CP) $(srcdir)/$$I $(distdir); done
depend dep: mcdep depend dep: mcdep

View File

@ -325,8 +325,10 @@ distclean: cleansourcelinks
-if test $(srcdir) = .; then $(MAKE) realclean; fi -if test $(srcdir) = .; then $(MAKE) realclean; fi
$(RMF) $(srcdir)/Makefile $(RMF) $(srcdir)/Makefile
distcopy: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DISTGNOME); do $(CP) $(top_srcdir)/gnome/$$I $(top_srcdir)/mc-$(VERSION)/gnome; done
distdir:
for I in $(DISTGNOME); do $(CP) $(srcdir)/$$I $(distdir); done
install: install_@mx@ install: install_@mx@

View File

@ -77,8 +77,10 @@ install: @MCEDIT@
uninstall: uninstall:
$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
distcopy: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DIST); do $(CP) $(top_srcdir)/gtkedit/$$I $(top_srcdir)/mc-$(VERSION)/gtkedit; done
distdir:
for I in $(DIST); do $(CP) $(srcdir)/$$I $(distdir); done
depend dep: mcdep depend dep: mcdep

View File

@ -29,6 +29,9 @@ DISTSLANG = Makefile.in ChangeLog README $(SLANGSRCS) $(SLANGHDRS)
all: @LIBSLANG@ all: @LIBSLANG@
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=slang/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
.c.o: .c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
@ -64,8 +67,10 @@ distclean:
-if test $(srcdir) = .; then $(MAKE) realclean; fi -if test $(srcdir) = .; then $(MAKE) realclean; fi
$(RMF) $(srcdir)/Makefile $(RMF) $(srcdir)/Makefile
distcopy: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DISTSLANG); do $(CP) $(top_srcdir)/slang/$$I $(top_srcdir)/mc-$(VERSION)/slang; done
distdir:
for I in $(DISTSLANG); do $(CP) $(srcdir)/$$I $(distdir); done
install uninstall: install uninstall:

View File

@ -140,8 +140,10 @@ uninstall:
$(RMF) $(DESTDIR)$(suppbindir)/cons.saver $(RMF) $(DESTDIR)$(suppbindir)/cons.saver
$(RMF) $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp $(RMF) $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp
distcopy: $(srcdir)/mc.hlp distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DISTFILES); do $(CP) $(top_srcdir)/src/$$I $(top_srcdir)/mc-$(VERSION)/src; done
distdir: $(srcdir)/mc.hlp
for I in $(DISTFILES); do $(CP) $(srcdir)/$$I $(distdir); done
depend dep: mcdep depend dep: mcdep

View File

@ -368,27 +368,29 @@ uninstall:
-rmdir $(DESTDIR)$(extfsdir) -rmdir $(DESTDIR)$(extfsdir)
$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcserv $(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcserv
distcopy: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
for I in $(DISTVFS); do $(CP) $(top_srcdir)/vfs/$$I $(top_srcdir)/mc-$(VERSION)/vfs; done
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/extfs
for I in $(EXTFSSTUFF); do $(CP) $(top_srcdir)/vfs/extfs/$$I $(top_srcdir)/mc-$(VERSION)/vfs/extfs; done
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/include
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/lib
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/libsmb
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/param
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/smbwrapper
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/tests
mkdir $(top_srcdir)/mc-$(VERSION)/vfs/samba/ubiqx
for I in $(SAMBA_DIST_TOPLEVEL); do $(CP) $(top_srcdir)/vfs/samba/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba; done distdir:
for I in $(SAMBA_DIST_INCLUDE); do $(CP) $(top_srcdir)/vfs/samba/include/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/include; done for I in $(DISTVFS); do $(CP) $(srcdir)/$$I $(distdir); done
for I in $(SAMBA_DIST_LIB); do $(CP) $(top_srcdir)/vfs/samba/lib/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/lib; done mkdir $(distdir)/extfs
for I in $(SAMBA_DIST_LIBSMB); do $(CP) $(top_srcdir)/vfs/samba/libsmb/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/libsmb; done for I in $(EXTFSSTUFF); do $(CP) $(srcdir)/extfs/$$I $(distdir)/extfs; done
for I in $(SAMBA_DIST_PARAM); do $(CP) $(top_srcdir)/vfs/samba/param/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/param; done mkdir $(distdir)/samba
for I in $(SAMBA_DIST_SMBWRAPPER); do $(CP) $(top_srcdir)/vfs/samba/smbwrapper/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/smbwrapper; done mkdir $(distdir)/samba/include
for I in $(SAMBA_DIST_TESTS); do $(CP) $(top_srcdir)/vfs/samba/tests/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/tests; done mkdir $(distdir)/samba/lib
for I in $(SAMBA_DIST_UBIQX); do $(CP) $(top_srcdir)/vfs/samba/ubiqx/$$I $(top_srcdir)/mc-$(VERSION)/vfs/samba/ubiqx; done mkdir $(distdir)/samba/libsmb
mkdir $(distdir)/samba/param
mkdir $(distdir)/samba/smbwrapper
mkdir $(distdir)/samba/tests
mkdir $(distdir)/samba/ubiqx
for I in $(SAMBA_DIST_TOPLEVEL); do $(CP) $(srcdir)/samba/$$I $(distdir)/samba; done
for I in $(SAMBA_DIST_INCLUDE); do $(CP) $(srcdir)/samba/include/$$I $(distdir)/samba/include; done
for I in $(SAMBA_DIST_LIB); do $(CP) $(srcdir)/samba/lib/$$I $(distdir)/samba/lib; done
for I in $(SAMBA_DIST_LIBSMB); do $(CP) $(srcdir)/samba/libsmb/$$I $(distdir)/samba/libsmb; done
for I in $(SAMBA_DIST_PARAM); do $(CP) $(srcdir)/samba/param/$$I $(distdir)/samba/param; done
for I in $(SAMBA_DIST_SMBWRAPPER); do $(CP) $(srcdir)/samba/smbwrapper/$$I $(distdir)/samba/smbwrapper; done
for I in $(SAMBA_DIST_TESTS); do $(CP) $(srcdir)/samba/tests/$$I $(distdir)/samba/tests; done
for I in $(SAMBA_DIST_UBIQX); do $(CP) $(srcdir)/samba/ubiqx/$$I $(distdir)/samba/ubiqx; done
depend dep: mcdep depend dep: mcdep