[Qemacs-commit] qemacs Makefile libqhtml/Makefile

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/05/08 06:15:43

Modified files:
        .              : Makefile 
        libqhtml       : Makefile 

Log message:
        build: group all intermediary targets in .objs directory
        - each architecture has a specific subdirectory
        - object files for qe, xqe and tqe are each in an arch specific 
subdirectory
        - libraries are generated in .objs with an arch specific name

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/Makefile?cvsroot=qemacs&r1=1.11&r2=1.12

Patches:
Index: Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/Makefile,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- Makefile    7 May 2017 06:08:32 -0000       1.99
+++ Makefile    8 May 2017 10:15:43 -0000       1.100
@@ -137,8 +137,8 @@
 endif
 
 ifdef CONFIG_HTML
-  QHTML_DEPS:= libqhtml/libqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC).a
-  QHTML_LIBS:= -L./libqhtml -lqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)
+  QHTML_DEPS:= $(DEPTH)/.objs/libqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC).a
+  QHTML_LIBS:= -L$(DEPTH)/.objs -lqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)
   CFLAGS+= -I./libqhtml
   DEP_LIBS+= $(QHTML_DEPS)
   LIBS+= $(QHTML_LIBS)
@@ -198,15 +198,15 @@
 DEPENDS:= qe.h config.h cutils.h display.h qestyles.h variables.h config.mak
 DEPENDS:= $(addprefix $(DEPTH)/, $(DEPENDS))
 
-OBJS_DIR:= $(DEPTH)/.objs-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)
+OBJS_DIR:= $(DEPTH)/.objs/$(TARGET_OS)-$(TARGET_ARCH)-$(CC)/qe
 CFLAGS+= -I$(OBJS_DIR)
 OBJS:= $(addprefix $(OBJS_DIR)/, $(OBJS))
 
-XOBJS_DIR:= $(DEPTH)/.xobjs-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)
+XOBJS_DIR:= $(DEPTH)/.objs/$(TARGET_OS)-$(TARGET_ARCH)-$(CC)/xqe
 XCFLAGS+= -I$(XOBJS_DIR)
 XOBJS:= $(addprefix $(XOBJS_DIR)/, $(XOBJS))
 
-TOBJS_DIR:= $(DEPTH)/.tobjs-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)
+TOBJS_DIR:= $(DEPTH)/.objs/$(TARGET_OS)-$(TARGET_ARCH)-$(CC)/tqe
 TCFLAGS+= -I$(TOBJS_DIR)
 TOBJS:= $(addprefix $(TOBJS_DIR)/, $(TOBJS))
 
@@ -490,14 +490,14 @@
 #
 clean:
        $(MAKE) -C libqhtml clean
-       rm -rf *.dSYM .objs* .tobjs* .xobjs* $(OBJS_DIR) $(XOBJS_DIR) 
$(TOBJS_DIR)
+       rm -rf *.dSYM .objs* .tobjs* .xobjs*
        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
        $(MAKE) -C libqhtml distclean
-       rm -rf .objs* .tobjs* .xobjs* $(OBJS_DIR) $(XOBJS_DIR) $(TOBJS_DIR)
+       rm -rf .objs* .tobjs* .xobjs*
        rm -rf config.h config.mak
 
 install: $(TARGETS) qe.1

Index: libqhtml/Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libqhtml/Makefile   25 Mar 2017 18:04:51 -0000      1.11
+++ libqhtml/Makefile   8 May 2017 10:15:43 -0000       1.12
@@ -55,13 +55,13 @@
 
 CFLAGS+=-I$(DEPTH)
 
-LIB= libqhtml-$(TARGET_OS)-$(TARGET_ARCH)-$(CC).a
+LIB= $(DEPTH)/.objs/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-$(TARGET_OS)-$(TARGET_ARCH)-$(CC)/libqhtml
+OBJS_DIR:= $(DEPTH)/.objs/$(TARGET_OS)-$(TARGET_ARCH)-$(CC)/libqhtml
 OBJS:= $(addprefix $(OBJS_DIR)/, $(OBJS))
 
 $(shell mkdir -p $(OBJS_DIR))