--- rpl/modules/motif/Makefile.am	2017/07/10 14:47:59	1.5
+++ rpl/modules/motif/Makefile.am	2017/08/04 08:19:04	1.11
@@ -10,6 +10,7 @@ SRCRPLC=\
 	XtPopdown.rplc \
 	XtPopup.rplc \
 	XtRealizeWidget.rplc \
+	XtRemoveCallback.rplc \
 	callbacks.rplc \
 	motif.rplc \
 	types.rplc
@@ -27,12 +28,12 @@ all: motif.rplso
 EXTRA_DIST = $(SRCRPLC) $(SRCH) $(EXAMPLES) definitions.sh
 
 clean:
-	\rm -f $(OBJ) motif.rplso
+	\rm -f $(OBJ) motif.rplso variables.h
 
 variables.h: definitions.sh
 	@echo "  DEF  	 $@"
 	@$(srcdir)/definitions.sh $(builddir) $(top_builddir) \
-			$(top_srcdir)/tools/@OPENMOTIF@
+			$(top_builddir)/tools/@OPENMOTIF@/install/include
 
 %.o: %.rplc $(SRCH) \
 		$(top_builddir)/src/rplexternals.h $(top_builddir)/src/rpl.h \
@@ -41,6 +42,7 @@ variables.h: definitions.sh
 	@gfortran -x c -fPIC -Wall -DRPLCONFIG -O2 -g -funsigned-char \
 			-I$(top_srcdir) -I$(top_builddir)/src -I$(builddir) \
 			-DREADLINE_LIBRARY \
+			-I$(top_builddir) \
 			-I$(top_srcdir)/tools/@READLINE@ \
 			-I$(top_builddir)/tools/@READLINE@ \
 			-I$(top_builddir)/tools/@GSL@ \