From 81f180c6a3eb09a66779b507ca5e64bc35794e84 Mon Sep 17 00:00:00 2001 From: lecoanet Date: Wed, 2 Feb 2000 13:32:02 +0000 Subject: Passage en Zinc. Adaptations pour Solaris. D�termination auto des chemins pour Perl. --- Makefile.in | 92 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 41 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3d72665..ac0e3af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,11 +42,23 @@ LDFLAGS = -L. @LDFLAGS@ @X_LIBS@ @LOCAL_X_LIBS@ 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 -XRADAR_VER = @XRADAR_VER@ -XRADAR_MAJOR = @XRADAR_MAJOR@ +ZINC_VER = @ZINC_VER@ +ZINC_MAJOR = @ZINC_MAJOR@ CFLAGS = -Wall $(SHARED_LIB_CFLAGS) CPPFLAGS = @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY -PTKCFLAGS = -DPTK -I/usr/lib/perl5/i386-linux/5.004/Tk/pTk +# +# Linux +#PTKLIB = /usr/lib/perl5/i386-linux/5.004/Tk/pTk +#SITEPERL = /usr/local/lib/site_perl +# +# Solaris +#PTKLIB = /usr/local/lib/perl5/site_perl/5.005/sun4-solaris/Tk/pTk +#SITEPERL = /usr/local/lib/perl5/site_perl +# +# Auto +PTKLIB = @PERLLIB@/Tk/pTk +SITEPERL = @SITEPERL@ +PTKCFLAGS = -DPTK -I$(PTKLIB) # # Recognized compilation time flags are : @@ -62,24 +74,22 @@ DFLAGS = -DOM -DSHAPE # This set for cc under HP-UX # # -#------- Nothing to be modified by users below this line (hopefully ;-) ) -------------------------------- +#------- Nothing to be modified by users below this line (hopefully ;-) ) ---------------- # TODO=Mosaic.c cfiles = Track.c Tabular.c Reticle.c Map.c Rectangle.c Arc.c Curve.c \ - Item.c PostScript.c MapInfo.c Attrs.c Draw.c Geo.c List.c \ + Item.c PostScript.c MapInfo.c Attrs.c Draw.c Geo.c List.c \ perfos.c version.c Transfo.c Group.c Icon.c Text.c Image.c Color.c -tkcfiles = tkRadar.c +tkcfiles = tkZinc.c omcfiles = OverlapMan.c hfiles = MapInfo.h List.h perfos.h patchlvl.h Types.h Transfo.h \ - Attrs.h Item.h PostScript.h Draw.h Image.h \ - Geo.h OverlapMan.h WidgetInfo.h Track.h + Attrs.h Item.h PostScript.h Draw.h Image.h Geo.h \ + OverlapMan.h WidgetInfo.h Track.h dfiles = Copyright projfiles = ChangeLog mkinstalldirs confiles = configure configure.in acaux.m4 config.h.in Makefile.in install-sh -afiles = $(cfiles) $(tkcfiles) $(hfiles) \ - $(tfiles) $(dfiles) $(projfiles) $(confiles) -rtlfiles = $(hfiles) $(tkhfiles) $(tfiles) $(dfiles) $(confiles) \ - $(bins) $(tklibs) +afiles = $(cfiles) $(tkcfiles) $(hfiles) $(tfiles) $(dfiles) $(projfiles) $(confiles) +rtlfiles = $(hfiles) $(tkhfiles) $(tfiles) $(dfiles) $(confiles) $(bins) $(tklibs) tkobjs = $(cfiles:%.c=tk/%.o) $(tkcfiles:%.c=tk/%.o) tkgobjs = $(cfiles:%.c=tk/%.g) $(tkcfiles:%.c=tk/%.g) @@ -89,8 +99,8 @@ ptkgobjs = $(cfiles:%.c=ptk/%.g) $(tkcfiles:%.c=ptk/%.g) omobjs = $(omcfiles:%.c=tk/%.o) omgobjs = $(omcfiles:%.c=tk/%.g) -tklibs = tkradar$(XRADAR_VER).$(XRADAR_MAJOR).so -ptklibs = libptkradar$(XRADAR_VER).$(XRADAR_MAJOR).so +tklibs = tkzinc$(ZINC_VER).$(ZINC_MAJOR).so +ptklibs = libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so fontbins = $(fonts:.bdf=.pcf) @@ -111,30 +121,30 @@ ptk/%.g: %.c .bdf.pcf: bdftopcf $*.bdf >$*.pcf -ptkradar: libptkradar$(XRADAR_VER).$(XRADAR_MAJOR).so Perl/Makefile_nodebug +ptkzinc: libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so Perl/Makefile_nodebug (cd Perl; make "LD_RUN_PATH=@X_LIBS@") -ptkradar_debug: libptkradar_debug$(XRADAR_VER).$(XRADAR_MAJOR).so Perl/Makefile_debug +ptkzinc_debug: libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so Perl/Makefile_debug (cd Perl; make "LD_RUN_PATH=@X_LIBS@") -testptk: ptkradar - (cd Perl; make pure_install; perl -I/usr/local/lib/site_perl t/radar.pl) +testptk: ptkzinc + (cd Perl; make pure_install; perl -I$(SITEPERL) t/zinc.pl) Perl/Makefile_nodebug: - (cd Perl; perl Makefile.PL ptkradar$(XRADAR_VER).$(XRADAR_MAJOR)) + (cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR) $(PTKLIB)) Perl/Makefile_debug: - (cd Perl; perl Makefile.PL ptkradar$(XRADAR_VER).$(XRADAR_MAJOR)_debug) -libptkradar$(XRADAR_VER).$(XRADAR_MAJOR).so: ptk $(ptkobjs) libom.so + (cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR)_debug $(PTKLIB)) +libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkobjs) libom.so $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(ptkobjs) -libptkradar_debug$(XRADAR_VER).$(XRADAR_MAJOR).so: ptk $(ptkgobjs) libom_debug.so +libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom_debug $(ptkgobjs) -tkradar: tkradar$(XRADAR_VER).$(XRADAR_MAJOR).so -tkradar$(XRADAR_VER).$(XRADAR_MAJOR).so: tk $(tkobjs) libom.so +tkzinc: tkzinc$(ZINC_VER).$(ZINC_MAJOR).so +tkzinc$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkobjs) libom.so $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(tkobjs) -tkradar_debug: tkradar_debug$(XRADAR_VER).$(XRADAR_MAJOR).so -tkradar_debug$(XRADAR_VER).$(XRADAR_MAJOR).so: tk $(tkgobjs) libom_debug.so +tkzinc_debug: tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so +tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkgobjs) libom_debug.so $(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom_debug $(tkgobjs) -tkradar_profile: tkradar_profile.a libom.so - $(CC) -pg -o radarwish $(SHARED_TK_LIBS) -L. -ltcl8.0 -ltk8.0 -lom tkAppInit.c tkradar_profile.a -o radarwish -tkradar_profile.a: tk $(tkpgobjs) libom_debug.so +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 +tkzinc_profile.a: tk $(tkpgobjs) libom_debug.so ar rv $@ $(tkpgobjs) libom.so: tk $(omobjs) @@ -163,7 +173,7 @@ installom: libom.so installtk: installdirs $(tklibs) $(INSTALL_DATA) $(tklibs) $(libdir) - cd $(libdir) && rm -f libtkradar.so + cd $(libdir) && rm -f libtkzinc.so for f in $(hfiles); do $(INSTALL_DATA) $$f $(incdir); done installptk: $(ptklibs) Perl/Makefile_nodebug @@ -174,10 +184,10 @@ installdirs: $(srcdir)/mkinstalldirs $(libdir) $(incdir) $(mandir) # -#------------- Stuff for maintaining XRADAR below ----------------------------------- +#------------- Stuff for maintaining ZINC below ----------------------------------- # -VERSION = @XRADAR_VERSION@ +VERSION = @ZINC_VERSION@ Makefile: Makefile.in config.status $(SHELL) config.status @@ -188,16 +198,16 @@ configure: configure.in config.h.in: configure.in cd $(srcdir); autoheader; touch config.h.in -dist: xradar$(VERSION).tar.gz -xradar$(VERSION).tar.gz: temp/xradar$(VERSION) - cd temp; tar cohf ../xradar$(VERSION).tar xradar$(VERSION) - -rm -f xradar$(VERSION).tar.gz - gzip -9 xradar$(VERSION).tar -temp/xradar$(VERSION): $(afiles) - -rm -rf temp/xradar$(VERSION) +dist: zinc$(VERSION).tar.gz +zinc$(VERSION).tar.gz: temp/zinc$(VERSION) + cd temp; tar cohf ../zinc$(VERSION).tar zinc$(VERSION) + -rm -f zinc$(VERSION).tar.gz + gzip -9 zinc$(VERSION).tar +temp/zinc$(VERSION): $(afiles) + -rm -rf temp/zinc$(VERSION) -mkdir temp - mkdir temp/xradar$(VERSION) - cd temp/xradar$(VERSION); for f in $(afiles); do ln -s ../../$$f .; done + mkdir temp/zinc$(VERSION) + cd temp/zinc$(VERSION); for f in $(afiles); do ln -s ../../$$f .; done ctags: $(hfiles) $(cfiles) $(tkcfiles) code.doc etags $(hfiles) $(cfiles) $(tkcfiles) code.doc -- cgit v1.1