diff options
| -rw-r--r-- | Makefile.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index c6dc6be..52336ae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,7 +51,8 @@ LDFLAGS = -L. @LDFLAGS@ @X_LIBS@ @LOCAL_X_LIBS@ # on some systems. SHARED_LIB_CFLAGS = @sharedlib_cflags@ SHARED_TK_LDFLAGS = @sharedlib_buildflags@ -SHARED_TK_LIBS = @X_LIBS@ @LOCAL_X_LIBS@ @XMU@ -lXext -lX11 @X_EXTRA_LIBS@ -lm +TCL_TK_VER = 8.2 +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) @@ -80,13 +81,14 @@ GPC=libgpc.so # PERFOS compile performance measurement code # PROFILE ask for profile support # OM include code for internal overlap manager +# SHM include code that need shared memory support # SHAPE include code for reshaping windows. # GPC include code for composing polygons. # -ifeq ($(strip$(GPC)),) -DFLAGS = -DOM -DSHAPE +ifeq ($(strip $(GPC)),'') +DFLAGS = -DOM -DSHAPE -DSHM else -DFLAGS = -DOM -DSHAPE -DGPC +DFLAGS = -DOM -DSHAPE -DSHM -DGPC endif #DFLAGS = -DTCL_MEM_DEBUG @@ -160,12 +162,12 @@ libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so $(G tkzinc: tkzinc$(ZINC_VER).$(ZINC_MAJOR).so $(GPC) tkzinc$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkobjs) libom.so $(GPC) - $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(GPC) $(tkobjs) + $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom $(GPC) $(tkobjs) tkzinc_debug: tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so $(GPC) tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkgobjs) libom_debug.so $(GPC) - $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom_debug $(GPC) $(tkgobjs) + $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom_debug $(GPC) $(tkgobjs) tkzinc_profile: tkzinc_profile.a libom.so - $(CC) -pg -o zincwish $(SHARED_TK_LIBS) -L. -ltcl8.0 -ltk8.0 -lom tkAppInit.c tkzinc_profile.a -o zincwish + $(CC) -pg -o zincwish $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom tkAppInit.c tkzinc_profile.a -o zincwish tkzinc_profile.a: tk $(tkpgobjs) libom_debug.so ar rv $@ $(tkpgobjs) @@ -175,7 +177,7 @@ libom_debug.so: tk $(omgobjs) $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(omgobjs) -lm libgpc.so: tk gpc/gpc.c gpc/gpc.h - $(CC) $(SHARED_TK_LDFLAGS) -o $@ gpc/gpc.c -lm + $(CC) $(SHARED_TK_LDFLAGS) $(SHARED_LIB_CFLAGS) -o $@ gpc/gpc.c -lm tk: -mkdir tk |