mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 09:19:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

* edit/Makefile.in: Don't link headers, add extra includes

Browse Source 
to CPPFLAGS instead. Put links to the build directory.
Remove the hack with "mx" - it is not needed anymore.
This commit is contained in:
Pavel Roskin 2000-09-14 16:50:54 +00:00
parent d572f3a51f
commit 35003a05c3
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-09-14 Pavel Roskin <proski@gnu.org> 2000-09-14 Pavel Roskin <proski@gnu.org>
* edit/Makefile.in: Don't link headers, add extra includes
to CPPFLAGS instead. Put links to the build directory.
Remove the hack with "mx" - it is not needed anymore.
* configure.in: remove any manupulations with top_srcdir. * configure.in: remove any manupulations with top_srcdir.
Don't change CPPGLAGS when the internal editor is enabled, Don't change CPPGLAGS when the internal editor is enabled,
instead do it ... instead do it ...

33
edit/Makefile.in
View File

@ -5,7 +5,8 @@ VPATH = @srcdir@
@MCFG@@MCF@ @MCFG@@MCF@
CFLAGS = $(XCFLAGS) CFLAGS = $(XCFLAGS)
CPPFLAGS = $(XCPPFLAGS) -I$(top_srcdir) CPPFLAGS = $(XCPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/edit \
-I$(top_srcdir)/gtkedit
LDFLAGS = $(XLDFLAGS) LDFLAGS = $(XLDFLAGS)
DEFS = $(XDEFS) DEFS = $(XDEFS)
LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ $(XLIB) LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ $(XLIB)
@ -20,6 +21,9 @@ AR = @AR@
EDITSRC = edit_key_translator.c EDITSRC = edit_key_translator.c
EDITLINKS = edit.c editcmd.c editwidget.c editdraw.c editmenu.c wordproc.c \
syntax.c editoptions.c bookmark.c
EDITOBJS = edit.o editcmd.o editwidget.o editdraw.o editmenu.o wordproc.o \ EDITOBJS = edit.o editcmd.o editwidget.o editdraw.o editmenu.o wordproc.o \
syntax.o editoptions.o bookmark.o syntax.o editoptions.o bookmark.o
@ -36,25 +40,12 @@ Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
check: check:
@echo no tests are supplied. @echo no tests are supplied.
checklinks: $(EDITLINKS):
@if test -f $(top_srcdir)/edit/edit.c; then echo ok; \ for i in $(EDITLINKS); do \
else $(MAKE) sourcelinks; fi $(LN_S) $(top_srcdir)/gtkedit/$$i . || exit 1; \
@if test -f $(top_srcdir)/edit/bookmark.c; then echo ok; \ done
else $(MAKE) sourcelinks; fi
sourcelinks: libedit.a: $(EDITOBJS)
-cd $(top_srcdir)/edit ; $(LN_S) ../gtkedit/*.[ch] . >/dev/null 2>&1 ; true
cleansourcelinks:
-if test -f $(top_srcdir)/edit/edit.c; then \
cd $(top_srcdir)/edit; find . -lname '*.[ch]' | xargs $(RM); \
fi
libedit.a: checklinks
$(MAKE) mx
touch mx
mx: $(EDITOBJS)
$(RMF) libedit.a $(RMF) libedit.a
$(AR) cr libedit.a $(EDITOBJS) $(AR) cr libedit.a $(EDITOBJS)
-$(RANLIB) libedit.a -$(RANLIB) libedit.a
@ -74,14 +65,14 @@ TAGS: $(EDITSRC)
etags $(EDITSRC) etags $(EDITSRC)
clean: clean:
$(RMF) *.o core a.out libedit.a mx $(RMF) *.o core a.out libedit.a $(EDITLINKS)
realclean: clean realclean: clean
$(RMF) .depend $(RMF) .depend
$(RMF) TAGS $(RMF) TAGS
$(RMF) *~ $(RMF) *~
distclean: cleansourcelinks distclean:
$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out $(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out
$(RMF) $(srcdir)/core $(srcdir)/libedit.a $(RMF) $(srcdir)/core $(srcdir)/libedit.a
-if test $(srcdir) = .; then $(MAKE) realclean; fi -if test $(srcdir) = .; then $(MAKE) realclean; fi