X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9040fe8b81dc3ca1ec6efba83976af65001c65cc..cbc121c7bab1d0773b1968225ed7b23825bf8072:/lwlib/Makefile.in

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 2cbc33d73c..af9c2a233e 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -9,6 +9,7 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 CC=@CC@
 CFLAGS=@CFLAGS@
 CPP=@CPP@
+CPPFLAGS=@CPPFLAGS@
 LN_S=@LN_S@
 RANLIB=@RANLIB@
 # See below--@X_TOOLKIT_TYPE@ is used below.
@@ -23,7 +24,6 @@ USE_X_TOOLKIT=@X_TOOLKIT_TYPE@
 
      LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
      MOTIF_OBJS = lwlib-Xm.o
-      OLIT_OBJS = lwlib-Xol.o lwlib-Xolmb.o
 
 TOOLKIT_DEFINES = -DUSE_$(USE_X_TOOLKIT)
    TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS)
@@ -32,12 +32,11 @@ TOOLKIT_DEFINES = -DUSE_$(USE_X_TOOLKIT)
 
 # ../src is needed to find config.h.
 ALL_CFLAGS= $(C_SWITCH_SITE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
-  $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) $(CPPFLAGS) $(CFLAGS) \
-  -DEMACS_BITMAP_FILES -DHAVE_CONFIG_H -Demacs \
-  -I. -I../src -I${srcdir} -I${srcdir}/../src
+  $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) $(CFLAGS) \
+  -DHAVE_CONFIG_H -Demacs -I. -I../src -I${srcdir} -I${srcdir}/../src
 
 .c.o:
-	$(CC) -c ${ALL_CFLAGS} $<
+	$(CC) -c $(CPPFLAGS) ${ALL_CFLAGS} $<
 
 all:: liblw.a
 
@@ -48,22 +47,17 @@ liblw.a: $(OBJS)
 
 # Depend on Makefile so that we recompile if TOOLKIT_DEFINES changes.
 lwlib.o:  $(srcdir)/lwlib.c  Makefile
-	$(CC) -c $(TOOLKIT_DEFINES) $(ALL_CFLAGS) $(srcdir)/lwlib.c
-
-xrdb-cpp.o:  $(srcdir)/xrdb-cpp.c
-	$(CC) -c "-DCPP_PROGRAM=$(CPP)" $(ALL_CFLAGS) $(srcdir)/xrdb-cpp.c
+	$(CC) -c $(CPPFLAGS) $(TOOLKIT_DEFINES) $(ALL_CFLAGS) $(srcdir)/lwlib.c
 
 lwlib-utils.o: lwlib-utils.c lwlib-utils.h
 lwlib.o:       lwlib.c lwlib.h lwlib-int.h lwlib-Xaw.h lwlib-Xlw.h
 lwlib-Xlw.o:   lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h
 lwlib-Xaw.o:   lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h
 lwlib-Xm.o:    lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h
-lwlib-Xol.o:   lwlib-Xol.c lwlib.h lwlib-int.h
-lwlib-Xolmb.o: lwlib-Xolmb.c lwlib-Xolmb.h lwlib-XolmbP.h
 xlwmenu.o: xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h
 
 mostlyclean:
-	$(RM) *.o core errs ,* *~ *.a .emacs_* make.log MakeOut \#*
+	$(RM) *.o core errs ,* *.a .emacs_* make.log MakeOut \#*
 
 clean: mostlyclean
 distclean: clean