From a59dea245bbe95145b75e764d4c4a0c576856146 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Wed, 22 Jan 2003 14:47:12 +0000
Subject: Modifs pour compiler totalement ind�pendament la version Tcl et la
 version Perl.

---
 Makefile.in | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 5fc5849..d42aa18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,13 +44,14 @@ LDFLAGS = -L. @LDFLAGS@ @X_LIBS@ @LOCAL_X_LIBS@
 # on some systems.
 SHARED_LIB_CFLAGS = @sharedlib_cflags@
 SHARED_TK_LDFLAGS = @sharedlib_buildflags@
-TCL_TK_VER = 8.4
+TCL_TK_VER = 8.3
 TK_INCLUDE_PATH=/usr/include/tcl$(TCL_TK_VER)
 SHARED_TK_LIBS = @X_LIBS@ @LOCAL_X_LIBS@ @XMU@ -lXext -lX11 @X_EXTRA_LIBS@ -lm
 ZINC_VER = @ZINC_VER@
 ZINC_MAJOR = @ZINC_MAJOR@
 CFLAGS = -Wall $(SHARED_LIB_CFLAGS)
-CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(TK_INCLUDE_PATH) -I$(srcdir) -DBUILD_LIBRARY
+CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY
+TKCFLAGS = -I$(TK_INCLUDE_PATH)
 #
 # Linux
 #PTKLIB = /usr/lib/perl5/i386-linux/5.004/Tk/pTk
@@ -110,8 +111,8 @@ tkgobjs = $(cfiles:%.c=tk/%.g) $(tkcfiles:%.c=tk/%.g)
 tkpgobjs = $(cfiles:%.c=tk/%.pg) $(tkcfiles:%.c=tk/%.pg)
 ptkobjs = $(cfiles:%.c=ptk/%.o) $(tkcfiles:%.c=ptk/%.o)
 ptkgobjs = $(cfiles:%.c=ptk/%.g) $(tkcfiles:%.c=ptk/%.g)
-omobjs = $(omcfiles:%.c=tk/%.o)
-omgobjs = $(omcfiles:%.c=tk/%.g)
+omobjs = $(omcfiles:%.c=om/%.o)
+omgobjs = $(omcfiles:%.c=om/%.g)
 
 tklibs = tkzinc$(ZINC_VER).$(ZINC_MAJOR).so
 ptklibs = libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so
@@ -121,9 +122,9 @@ fontbins = $(fonts:.bdf=.pcf)
 .SUFFIXES: .g .bdf .pcf
 
 tk/%.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -O -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TKCFLAGS) -O -c $< -o $@
 tk/%.g: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -g -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TKCFLAGS) -g -c $< -o $@
 tk/%.pg: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -pg -c $< -o $@
 
@@ -132,6 +133,11 @@ ptk/%.o: %.c
 ptk/%.g: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(PTKCFLAGS) -g -c $< -o $@
 
+om/%.o: %.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -O -c $< -o $@
+om/%.g: %.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -g -c $< -o $@
+
 .bdf.pcf:
 	bdftopcf $*.bdf >$*.pcf
 
@@ -164,9 +170,9 @@ tkzinc_profile: tkzinc_profile.a libom.so
 tkzinc_profile.a: tk $(tkpgobjs) libom_debug.so
 	ar rv $@ $(tkpgobjs)
 
-libom.so: tk $(omobjs)
+libom.so: om $(omobjs)
 	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(omobjs) -lm
-libom_debug.so: tk $(omgobjs)
+libom_debug.so: om $(omgobjs)
 	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(omgobjs) -lm
 
 tk:
@@ -175,6 +181,9 @@ tk:
 ptk:
 	-mkdir ptk
 
+om:
+	-mkdir om
+
 doc: doc/refman.pdf doc/refman.html
 
 doc/refman.html: 
-- 
cgit v1.1