Commit 8f45ebb8 authored by Glenn Morris's avatar Glenn Morris

lwlib/Makefile.in misc cleanup.

* lwlib/Makefile.in (USE_X_TOOLKIT, RM, TOOLKIT_DEFINES): Remove.
(ALL_CFLAGS): Remove -I.
(config_h, lisp_h, src_h): New variables.
(globals_h): Rename from $globals.
($(globals_h)): Check cd exit status.
(lwlib.o): Remove special rule.
(lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o, xlwmenu.o):
Add lisp.h and config.h to prereqs.
(lwlib-utils.o): Add lwlib.h to prereqs.
(lwlib.o): Add lwlib-utils.h and lwlib-Xm.h to prereqs.
(lwlib-Xlw.o): Add xlwmenu.h to prereqs.
(xlwmenu.o): Add ../src/xterm.h to prereqs.
(mostlyclean): Forget about "core" files.
parent eb5141d9
2011-02-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (USE_X_TOOLKIT, RM, TOOLKIT_DEFINES): Remove.
(ALL_CFLAGS): Remove -I.
(config_h, lisp_h, src_h): New variables.
(globals_h): Rename from $globals.
($(globals_h)): Check cd exit status.
(lwlib.o): Remove special rule.
(lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o)
(xlwmenu.o): Add lisp.h and config.h to prereqs.
(lwlib-utils.o): Add lwlib.h to prereqs.
(lwlib.o): Add lwlib-utils.h and lwlib-Xm.h to prereqs.
(lwlib-Xlw.o): Add xlwmenu.h to prereqs.
(xlwmenu.o): Add ../src/xterm.h to prereqs.
(mostlyclean): Forget about "core" files.
2011-02-10 Glenn Morris <rgm@gnu.org>
* lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib-utils.c, lwlib.c:
......
......@@ -36,25 +36,26 @@ CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
RANLIB=@RANLIB@
# See below--@X_TOOLKIT_TYPE@ is used below.
USE_X_TOOLKIT=@X_TOOLKIT_TYPE@
AR = ar cq
RM = rm -f
LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
MOTIF_OBJS = lwlib-Xm.o
TOOLKIT_DEFINES =
## LUCID_OBJS or MOTIF_OBJS.
TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS)
OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o
# ../src is needed to find config.h.
## ../src is where the generated file (config.h, globals.h) are.
## $(srcdir)/../src is where the non-generated files (lisp.h) are.
## (In an out-of-tree build, these two are not the same.)
## $(srcdir) is where the lwlib sources are.
## There are no generated lwlib files, hence no need for -I.
ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \
$(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \
-DHAVE_CONFIG_H -Demacs -I. -I../src -I$(srcdir) -I$(srcdir)/../src
-DHAVE_CONFIG_H -Demacs -I../src -I$(srcdir) -I$(srcdir)/../src
.c.o:
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
......@@ -62,35 +63,37 @@ ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
all:: liblw.a
liblw.a: $(OBJS)
$(RM) $@
rm -f $@
$(AR) $@ $(OBJS)
$(RANLIB) $@
## Generated files in ../src, non-generated in $(srcdir)/../src.
config_h = ../src/config.h
lisp_h = $(srcdir)/../src/lisp.h
## lisp.h includes this.
globals = ../src/globals.h
globals_h = ../src/globals.h
src_h = $(config_h) $(lisp_h) $(globals_h)
$(globals):
cd ../src; $(MAKE) $(MFLAGS) globals.h
$(globals_h):
cd ../src && $(MAKE) $(MFLAGS) globals.h
# Depend on Makefile so that we recompile if TOOLKIT_DEFINES changes.
lwlib.o: $(srcdir)/lwlib.c Makefile
$(CC) -c $(CPPFLAGS) $(TOOLKIT_DEFINES) $(ALL_CFLAGS) $(srcdir)/lwlib.c
lwlib-utils.o: $(globals) lwlib-utils.c lwlib-utils.h
lwlib.o: $(globals) lwlib.c lwlib.h lwlib-int.h lwlib-Xaw.h lwlib-Xlw.h
lwlib-Xlw.o: $(globals) lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h
lwlib-Xaw.o: $(globals) lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h
lwlib-Xm.o: $(globals) lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h
xlwmenu.o: $(globals) xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h
lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h
lwlib.o: $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \
lwlib-Xlw.h lwlib-Xm.h lwlib-Xaw.h
lwlib-Xlw.o: $(src_h) lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h xlwmenu.h
lwlib-Xaw.o: $(src_h) lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h
lwlib-Xm.o: $(src_h) lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h
xlwmenu.o: $(src_h) xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h \
$(srcdir)/../src/xterm.h
mostlyclean:
$(RM) *.o core liblw.a \#*
rm -f *.o liblw.a \#*
clean: mostlyclean
distclean: clean
$(RM) Makefile
rm -f Makefile
maintainer-clean: distclean
$(RM) TAGS
rm -f TAGS
TAGS:
../lib-src/etags $(srcdir)/*.[ch]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment