[Qemacs-commit] qemacs .cvsignore Makefile TODO.org libqhtml/Ma...

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        16/12/27 06:40:42

Modified files:
        .              : .cvsignore Makefile TODO.org 
        libqhtml       : Makefile 

Log message:
        build: improvements
        - generate libqhtml object files in target dependant directories
        - make multiple targets coexist
        - fix .cvsignore file
        - fix clean and distclean targets

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/.cvsignore?cvsroot=qemacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/qemacs/TODO.org?cvsroot=qemacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/Makefile?cvsroot=qemacs&r1=1.9&r2=1.10

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/qemacs/qemacs/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- .cvsignore  26 Nov 2016 11:00:42 -0000      1.15
+++ .cvsignore  27 Dec 2016 11:40:40 -0000      1.16
@@ -1,7 +1,12 @@
+# generated-files
 config.mak
 config.h
+fbffonts.c
+# object-directories
 .objs*
 .tobjs*
+.xobjs*
+# target-files
 *.exe
 *.dSYM
 qe
@@ -11,40 +16,43 @@
 xqe
 xqe_g
 fbftoqe
-fbffonts.c
 html2png
 cptoqe
 kmaptoqe
 ligtoqe
 jistoqe
-allmodules.txt
-basemodules.txt
-STATS
-.tags
+# temp-directories
+doc
+junk
 patches
+qsn
+# work-directories
 cur
 old
 nnn
-msg
-doc
-junk
-.qerc
-
-BUGS
-DONE
-fff
-ggg
+new
+xxx
+# temp-files
+.tags
 m
-r
+t
 tt
+ttt
+# uncommitted-files
+STATS
+BUGS
+DONE
+.qerc
 cflags.mk
 fnmatch.c
+parser-new.c
 itoa.c
+strtools.c
 lang-discuss.md
 rationale.md
+txl.c
 nim.c
 rebol.c
-txl.c
 elm.c
 jai.c
 ats.c

Index: Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/Makefile,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- Makefile    25 Dec 2016 23:32:48 -0000      1.91
+++ Makefile    27 Dec 2016 11:40:42 -0000      1.92
@@ -71,6 +71,10 @@
 TOBJS:= $(OBJS)
 OBJS+= extras.o variables.o
 
+ifdef CONFIG_DARWIN
+  LDFLAGS += -L/opt/local/lib/
+endif
+
 ifdef CONFIG_PNG_OUTPUT
   HTMLTOPPM_LIBS += -lpng
 endif
@@ -133,9 +137,11 @@
 endif
 
 ifdef CONFIG_HTML
+  QHTML_DEPS:= libqhtml/libqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC).a
+  QHTML_LIBS:= -L./libqhtml -lqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)
   CFLAGS+= -I./libqhtml
-  DEP_LIBS+= libqhtml/libqhtml.a
-  LIBS+= -L./libqhtml -lqhtml
+  DEP_LIBS+= $(QHTML_DEPS)
+  LIBS+= $(QHTML_LIBS)
   OBJS+= html.o docbook.o
   ifndef CONFIG_WIN32
     TARGETLIBS+= libqhtml
@@ -460,9 +466,9 @@
 
 OBJS1:=$(addprefix $(OBJS_DIR)/, $(OBJS1))
 
-html2png$(EXE): $(OBJS1) libqhtml/libqhtml.a
+html2png$(EXE): $(OBJS1) $(QHTML_DEPS)
        $(echo) LD $@
-       $(cmd)  $(CC) $(LDFLAGS) -o $@ $(OBJS1) -L./libqhtml -lqhtml 
$(HTMLTOPPM_LIBS)
+       $(cmd)  $(CC) $(LDFLAGS) -o $@ $(OBJS1) $(QHTML_LIBS) $(HTMLTOPPM_LIBS)
 
 # autotest target
 test:
@@ -481,13 +487,15 @@
 #
 clean:
        $(MAKE) -C libqhtml clean
-       rm -rf *.dSYM $(OBJS_DIR) $(XOBJS_DIR) $(TOBJS_DIR) .objs-* .tobjs-*
+       rm -rf *.dSYM .objs* .tobjs* .xobjs* $(OBJS_DIR) $(XOBJS_DIR) 
$(TOBJS_DIR)
        rm -f *~ *.o *.a *.exe *_g TAGS gmon.out core *.exe.stackdump   \
            qe tqe t1qe xqe qfribidi kmaptoqe ligtoqe html2png fbftoqe 
fbffonts.c \
            cptoqe jistoqe allmodules.txt basemodules.txt '.#'*[0-9]
 
 distclean: clean
-       rm -rf config.h config.mak $(OBJS_DIR) $(XOBJS_DIR) $(TOBJS_DIR)
+       $(MAKE) -C libqhtml distclean
+       rm -rf .objs* .tobjs* .xobjs* $(OBJS_DIR) $(XOBJS_DIR) $(TOBJS_DIR)
+       rm -rf config.h config.mak
 
 install: $(TARGETS) qe.1
        $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin

Index: TODO.org
===================================================================
RCS file: /sources/qemacs/qemacs/TODO.org,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- TODO.org    27 Dec 2016 10:13:46 -0000      1.18
+++ TODO.org    27 Dec 2016 11:40:42 -0000      1.19
@@ -7,6 +7,7 @@
 
 * Priority 0
 
+** basic: remove some hotkeys in incremental search: C-b
 ** basic: reset last command when executing macro
 ** completion: fix electric behavior
 ** files: check file date to detect asynchronous modifications on disk

Index: libqhtml/Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libqhtml/Makefile   1 Jun 2014 17:34:39 -0000       1.9
+++ libqhtml/Makefile   27 Dec 2016 11:40:42 -0000      1.10
@@ -55,13 +55,13 @@
 
 CFLAGS+=-I$(DEPTH)
 
-LIB= libqhtml.a
+LIB= libqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC).a
 OBJS= css.o xmlparse.o cssparse.o html_style.o docbook_style.o
 
 DEPENDS:= qe.h config.h cutils.h display.h qestyles.h config.mak
 DEPENDS:= $(addprefix $(DEPTH)/, $(DEPENDS))
 
-OBJS_DIR:= $(DEPTH)/.objs/libqhtml
+OBJS_DIR:= $(DEPTH)/.objs-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)/libqhtml
 OBJS:= $(addprefix $(OBJS_DIR)/, $(OBJS))
 
 $(shell mkdir -p $(OBJS_DIR))
@@ -96,3 +96,5 @@
        rm -rf *.dSYM $(OBJS_DIR)
        rm -f *~ *.o *.a *.exe *_g TAGS gmon.out core *.exe.stackdump \
           csstoqe html_style.c docbook_style.c
+
+distclean: clean