[Nsclspectcl-cvscommits] SpecTcl/Display Makefile.am,4.7.2.4,4.7.2.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/nsclspectcl/SpecTcl/Display
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3065/Display

Modified Files:
      Tag: SpecTcl-2-1-fixes
	Makefile.am 
Log Message:
Make the build compatible with newer versions of autotools and
also make it possible to build with the default install of lesstif.
(Note this is not compatible with openmotif e.g.).

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/Makefile.am,v
retrieving revision 4.7.2.4
retrieving revision 4.7.2.5
diff -C2 -d -r4.7.2.4 -r4.7.2.5
*** Makefile.am	24 Aug 2004 20:09:22 -0000	4.7.2.4
--- Makefile.am	2 Jan 2006 16:54:46 -0000	4.7.2.5
***************
*** 5,22 ****
  	XMPushbutton.cc XMManagers.cc XMText.cc

! INCLUDES = -I.. @XINCLUDES@ @MOTIF_INCLUDES@ $(HOMEDEF) $(GRIFLAGS)
! LDFLAGS = -g @XLIBSW@ @MOTIF_LIBSW@ @XTLIBSW@ @LD_EXTRA_FLAGS@
! XCCFLAGS = -g -c -w -I. -I.. $(INCLUDES) -DXTFUNCPROTO -DXAMINE

! AM_CXXFLAGS = -g
! AM_CFLAGS   = -g

  install-exec-local:
! 	$(mkinstalldirs) $(prefix)/Etc
! 	$(INSTALL_PROGRAM) $(srcdir)/*.ctbl $(prefix)/Etc
! 	$(INSTALL_PROGRAM) $(srcdir)/*.ico  $(prefix)/Etc
  	$(INSTALL_PROGRAM) $(srcdir)/Xamine $(prefix)/bin/Xamine2_0

  $(LEXOUT):
  	$(LEX) windfile.l

--- 5,27 ----
  	XMPushbutton.cc XMManagers.cc XMText.cc

! INCLUDES = -I.. @XINCLUDES@ @MOTIF_INCLUDES@ $(HOMEDEF) $(GRIFLAGS) \
! 	-I@top_srcdir@/Utility
! AM_LDFLAGS = -g @XLIBSW@ @MOTIF_LIBSW@ @XTLIBSW@ 

! #  @LD_EXTRA_FLAGS@
! 
! XCCFLAGS =   -g -c -w -I. -I.. $(INCLUDES) -DXTFUNCPROTO -DXAMINE 
! 
! AM_CXXFLAGS = -g -pedantic
! AM_CFLAGS   = -g -pedantic

  install-exec-local:
! 	$(mkinstalldirs) $(prefix)/etc
! 	$(INSTALL_PROGRAM) $(srcdir)/*.ctbl $(prefix)/etc
! 	$(INSTALL_PROGRAM) $(srcdir)/*.ico  $(prefix)/etc
  	$(INSTALL_PROGRAM) $(srcdir)/Xamine $(prefix)/bin/Xamine2_0

  $(LEXOUT):
+ 	rm *_lex.{h,cc}
  	$(LEX) windfile.l

***************
*** 52,56 ****
  	$(LEX) grobfile.l
  	sed s/yy/grobjfile/g $(LEXOUT) >grobfile_lex.cc
! 	$(CC) $(XCCFLAGS) grobfile_lex.cc

  grobfile_parse.cc: grobfile.y dispgrob.h grobjio.h
--- 57,61 ----
  	$(LEX) grobfile.l
  	sed s/yy/grobjfile/g $(LEXOUT) >grobfile_lex.cc
! 	$(CXX) $(XCCFLAGS) grobfile_lex.cc

  grobfile_parse.cc: grobfile.y dispgrob.h grobjio.h
***************
*** 66,71 ****
  	rm -f y.tab.c

! grobfile.o: grobfile.cc dispgrob.h grobjio.h panemgr.h errormsg.h
! 	$(CC) $(XCCFLAGS) grobfile.cc

  defaultfile_lex.h: defaultfile.y windio.h
--- 71,75 ----
  	rm -f y.tab.c

! 

  defaultfile_lex.h: defaultfile.y windio.h
***************
*** 109,116 ****
  lib_LTLIBRARIES = libXamine.la

! libXamine_la_SOURCES = client.c clientgates.c prccheck.c allocator.c \
! specalloc.c clientbuttons.c
! 

--- 113,120 ----
  lib_LTLIBRARIES = libXamine.la

+ libXamine_la_LDFLAGS = -version-info $(SOVERSION):0

! libXamine_la_SOURCES = client.c clientgates.c  allocator.c \
! 	specalloc.c clientbuttons.c prccheck.c

***************
*** 127,135 ****
  titles.cc chanplot.cc plot1d.cc  plot2d.cc colormgr.cc shared.cc \
  location.cc convert.cc trackcursor.cc expand.cc select2.cc info.cc \
! dispgrob.cc  grobjdb.cc grobfile.cc \
  refreshdefault.cc  marker.cc grafinput.cc \
  grobjinput.cc grobjmgr.cc grobjdisplay.cc sumregion.cc integrate.cc \
  guintegrate.cc delgrob.cc messages.cc eventflags.cc gateio.cc \
! acceptgates.cc clirequests.cc prccheck.c spccheck.cc superpos.cc \
  superprompt.cc objcopy.cc copier.cc lblfont.cc checklist.cc \
  compatspec.cc copyatr.cc  buttonreq.cc buttondlg.cc \
--- 131,139 ----
  titles.cc chanplot.cc plot1d.cc  plot2d.cc colormgr.cc shared.cc \
  location.cc convert.cc trackcursor.cc expand.cc select2.cc info.cc \
! dispgrob.cc  grobjdb.cc  grobfile.cc xprccheck.c \
  refreshdefault.cc  marker.cc grafinput.cc \
  grobjinput.cc grobjmgr.cc grobjdisplay.cc sumregion.cc integrate.cc \
  guintegrate.cc delgrob.cc messages.cc eventflags.cc gateio.cc \
! acceptgates.cc clirequests.cc  spccheck.cc superpos.cc \
  superprompt.cc objcopy.cc copier.cc lblfont.cc checklist.cc \
  compatspec.cc copyatr.cc  buttonreq.cc buttondlg.cc \
***************
*** 137,143 ****
  lexsupport.c gc.cc xaminegc.cc gcmgr.cc Tab.c griprint.cc mapcoord.cc 

- # windfile_parse.cc windfile_lex.cc \
- #  grobfile_lex.cc grobfile_parse.cc \
- #  defaultfile_lex.cc defaultfile_parse.cc

  PARSEOBJECTS=windfile_parse.o windfile_lex.o grobfile_lex.o grobfile_parse.o \
--- 141,144 ----
***************
*** 151,156 ****
  Xaminetest_SOURCES = Xaminetest.c

- EXTRA_Xamine_SOURCES = defaultfile.y grobfile.y windfile.y defaultfile.l \
- grobfile.l windfile.l

  Xamine_LDADD = $(PARSEOBJECTS) -lXm -lXt -lX11 -lm -lfl $(X11EXTRA_LDFLAGS)
--- 152,155 ----
***************
*** 174,184 ****
  	grafinput.o grobjinput.o grobjmgr.o grobjdisplay.o  sumregion.o \
  	integrate.o guintegrate.o delgrob.o messages.o eventflags.o \
! 	gateio.o acceptgates.o clirequests.o spccheck.o prccheck.o superpos.o \
  	superprompt.o objcopy.o lblfont.o checklist.o compatspec.o copyatr.o \
  	buttonreq.o buttondlg.o spcchoice.o spccompatchoice.o spclimchoice.o \
  	ptlist.o lexsupport.o xaminegc.o gcmgr.o copier.o gc.o Tab.o \
! 	griprint.o mapcoord.o dispgrob.o grobfile_lex.o grobfile_parse.o \
! 	grobjdb.o grobfile.o XMCallback.o XMMenus.o XMDialogs.o XMManagers.o \
! 	XMWlist.o XMShell.o XMTab.o XMText.o colorset colorset.ico libXamine.la

  Xaminetest_DEPENDENCIES = libXamine.la
--- 173,183 ----
  	grafinput.o grobjinput.o grobjmgr.o grobjdisplay.o  sumregion.o \
  	integrate.o guintegrate.o delgrob.o messages.o eventflags.o \
! 	gateio.o acceptgates.o clirequests.o spccheck.o  superpos.o \
  	superprompt.o objcopy.o lblfont.o checklist.o compatspec.o copyatr.o \
  	buttonreq.o buttondlg.o spcchoice.o spccompatchoice.o spclimchoice.o \
  	ptlist.o lexsupport.o xaminegc.o gcmgr.o copier.o gc.o Tab.o \
! 	griprint.o mapcoord.o dispgrob.o  grobfile_lex.o grobfile_parse.o \
! 	grobjdb.o  XMCallback.o XMMenus.o XMDialogs.o XMManagers.o \
! 	XMWlist.o XMShell.o XMTab.o XMText.o colorset.ico libXamine.la

  Xaminetest_DEPENDENCIES = libXamine.la
***************
*** 187,192 ****
  	Xamine.ico Xamine.doc Xamine2.ctbl \
  	Xamine3.ctbl Xamine4.ctbl Xamine5.ctbl Xamine6.ctbl Xaminedemo.doc \
! 	aedpublic.for aedshare.f aedshare.for aedxamine.for
! 

  #  These files can cause problems on rebuilds.
--- 186,191 ----
  	Xamine.ico Xamine.doc Xamine2.ctbl \
  	Xamine3.ctbl Xamine4.ctbl Xamine5.ctbl Xamine6.ctbl Xaminedemo.doc \
! 	defaultfile.y grobfile.y windfile.y defaultfile.l \
! 	grobfile.l windfile.l

  #  These files can cause problems on rebuilds.
***************
*** 194,197 ****
  MOSTLYCLEANFILES = defaultfile_lex.cc defaultfile_lex.h grobfile_lex.cc \
  	grobfile_lex.h windfile_lex.cc windfile_lex.h              \
! 	defaultfile_parse.cc grobfile_parse.cc windfile_parse.cc
! 
--- 193,195 ----
  MOSTLYCLEANFILES = defaultfile_lex.cc defaultfile_lex.h grobfile_lex.cc \
  	grobfile_lex.h windfile_lex.cc windfile_lex.h              \
! 	defaultfile_parse.cc grobfile_parse.cc windfile_parse.cc
\ No newline at end of file