Re: [AD] keyboard recalcitrant under X

[Elias Pschernig <elias@xxxxxxxxxx>]

On Mon, 2003-03-10 at 08:48, Eric Botcazou wrote:

> The patch is ok if you use the same order in the ALLEGRO_EXE_TARGETS variable 
> than in the dependency line in makefile.in (I know, I'm picky).
> 

Arrhg, I also hadn't really figured out how configure.in works yet.
Adding AC_SUBST and @@ made it work though :) I commited the warnings to
CVS, the fixed make stuff is attached.

-- 
Elias Pschernig <elias@xxxxxxxxxx>

Index: makefile.in
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.in,v
retrieving revision 1.42
diff -u -r1.42 makefile.in
--- makefile.in	7 Feb 2003 18:50:45 -0000	1.42
+++ makefile.in	10 Mar 2003 08:36:15 -0000
@@ -125,9 +125,10 @@
 
 ALLEGRO_EXE_TARGETS = \
 	$(ALLEGRO_LIB_EXES) \
+	$(@ALLEGRO_MAYBE_LIB_X_EXES@) \
 	$(ALLEGRO_DATAFILE_EXES) \
 	$(ALLEGRO_EXAMPLE_EXES)
 # Header files (look in makefile.dep for "Headers referred by symbols").
@@ -528,7 +529,7 @@
 	$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh artsdigi "\`artsc-config --libs\`" $(ALLEGRO_MODULE_ARTS_FILES)' >>makefile.dep
 	$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh sgialdigi -laudio $(ALLEGRO_MODULE_SGIAL_FILES)' >>makefile.dep
 	@echo "Generating dependencies for simple programs"
-	$(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh $(ALLEGRO_LIB_EXE_SOURCES) $(ALLEGRO_EXAMPLE_FILES)' >>makefile.dep
+	$(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh $(ALLEGRO_LIB_EXE_SOURCES) $(@ALLEGRO_MAYBE_LIB_X_EXE_SOURCES@) $(ALLEGRO_EXAMPLE_FILES)' >>makefile.dep
 	@echo "Generating dependencies for datafile plugins"
 	$(SHELL) -c 'cd $(srcdir) && misc/depdlib.sh tools/datedit.c' >>makefile.dep
 	@echo "Generating dependencies for datafile programs"
Index: configure.in
===================================================================
RCS file: /cvsroot/alleg/allegro/configure.in,v
retrieving revision 1.54
diff -u -r1.54 configure.in
--- configure.in	7 Feb 2003 18:50:45 -0000	1.54
+++ configure.in	10 Mar 2003 08:36:16 -0000
@@ -308,10 +308,16 @@
 ALLEGRO_ACTEST_SUPPORT_XWINDOWS
 if test "$allegro_support_xwindows" = yes; then
   ALLEGRO_MAYBE_XWINDOWS_FILES=ALLEGRO_SRC_X_FILES
+  ALLEGRO_MAYBE_LIB_X_EXE_SOURCES=ALLEGRO_LIB_X_EXE_SOURCES
+  ALLEGRO_MAYBE_LIB_X_EXES=ALLEGRO_LIB_X_EXES
 else
   ALLEGRO_MAYBE_XWINDOWS_FILES=ALLEGRO_EMPTY_LIST
+  ALLEGRO_MAYBE_LIB_X_EXE_SOURCES=ALLEGRO_EMPTY_LIST
+  ALLEGRO_MAYBE_LIB_X_EXES=ALLEGRO_EMPTY_LIST
 fi
 AC_SUBST(ALLEGRO_MAYBE_XWINDOWS_FILES)
+AC_SUBST(ALLEGRO_MAYBE_LIB_X_EXE_SOURCES)
+AC_SUBST(ALLEGRO_MAYBE_LIB_X_EXES)
 AC_SUBST(ALLEGRO_XWINDOWS_LIBDIR)
 
 dnl Enable pthreads
Index: makefile.lst
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.lst,v
retrieving revision 1.77
diff -u -r1.77 makefile.lst
--- makefile.lst	28 Jan 2003 11:08:50 -0000	1.77
+++ makefile.lst	10 Mar 2003 08:36:16 -0000
@@ -395,6 +395,9 @@
 	tools/rgbmap.c \
 	tools/textconv.c
 
+ALLEGRO_LIB_X_EXE_SOURCES = \
+	tools/x11/xkeymap.c
+
 ALLEGRO_LIB_EXES = \
 	demo/demo \
 	setup/keyconf \
@@ -416,6 +419,9 @@
 	tools/pack \
 	tools/rgbmap \
 	tools/textconv
+	
+ALLEGRO_LIB_X_EXES = \
+	tools/x11/xkeymap
 
 ALLEGRO_DATAFILE_EXE_SOURCES = \
 	tools/dat.c \