From: Ron F. <ro...@us...> - 2004-04-12 16:51:22
|
Update of /cvsroot/nsclspectcl/SpecTcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29309 Modified Files: Tag: SpecTcl-2-2_development CHANGELOG Makefile.am Added Files: Tag: SpecTcl-2-2_development CompilationRules.include Directories.include Log Message: - Use etc for etc stuff with link named Etc rather than the other way around. - Extract all Makefile definitions into separate include files so the user makefile becomes less variable with time. --- NEW FILE: CompilationRules.include --- # # CompilationRules.include # # This file gets installed in $(prefix)/etc # It defines the default compilation rules that take: # cpp -> o (C++). # cxx -> o (C++). # cc -> o (C++). # c -> o (C). # # These rules are defined in terms of the following symbols that # are expected to be defined prior to their invocation: # # CXXFLAGS - C++ flags that are needed by my stuff. # USERCXXFLAGS - C++ flags that are added by the user. # CCFLAGS - C flags that are needed by my stuff. # USERCCFLAGS - C flags that are added to this by the user. # # The following will be written to the top of this include by the installation # procedure using information from autoconf: # # CXX - C++ compiler command. # CC - C compiler command. # CXXLD - Link for C++ # CCLD - Link for C. # C++ compilations. note that all the build rules should be identical # .cpp.o: $(CXX) -g -c $(CXXFLAGS) $(USERCXXFLAGS) $< .cxx.o: $(CXX) -g -c $(CXXFLAGS) $(USERCXXFLAGS) $< .cc.o: $(CXX) -g -c $(CXXFLAGS) $(USERCXXFLAGS) $< # # C compilation(s) if more are aded the build rules should be identical. .c.o: $(CC) -g -c $(CCFLAGS) $(USERCCFLAGS) $< Index: Makefile.am =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Makefile.am,v retrieving revision 4.8.2.1 retrieving revision 4.8.2.2 diff -C2 -d -r4.8.2.1 -r4.8.2.2 *** Makefile.am 17 Feb 2004 17:18:41 -0000 4.8.2.1 --- Makefile.am 12 Apr 2004 16:37:31 -0000 4.8.2.2 *************** *** 17,21 **** EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl \ bootstrap $(MYGRIDIR) \ ! doc build.cygwin dist-hook: --- 17,21 ---- EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl \ bootstrap $(MYGRIDIR) \ ! doc build.cygwin Directories.include CompilationRules.include dist-hook: *************** *** 24,33 **** cp $$file $(distdir)/$$file; \ done install-exec-local: install -d -m 0775 $(prefix) $(prefix)/bin $(prefix)/include install -m 0664 config.h $(prefix)/include ! install -d -m 0775 $(prefix)/lib $(prefix)/Etc ! install -d -m 0775 $(prefix)/Script $(prefix)/Skel install -d -m 0775 $(prefix)/contrib $(prefix)/doc $(prefix)/share install -m 0664 config.h $(prefix)/include --- 24,37 ---- cp $$file $(distdir)/$$file; \ done + (cd $(distdir)/$(MYGRIDIR); make -k clean) + install-exec-local: install -d -m 0775 $(prefix) $(prefix)/bin $(prefix)/include install -m 0664 config.h $(prefix)/include ! install -d -m 0775 $(prefix)/lib ! install -d -m 0775 $(prefix)/etc ! install -d -m 0775 $(prefix)/Script ! install -d -m 0775 $(prefix)/Skel install -d -m 0775 $(prefix)/contrib $(prefix)/doc $(prefix)/share install -m 0664 config.h $(prefix)/include *************** *** 35,40 **** --- 39,58 ---- rm -f $(prefix)/Lib rm -f $(prefix)/Include + rm -f $(prefix)/Etc ln -s $(prefix)/bin $(prefix)/Bin ln -s $(prefix)/lib $(prefix)/Lib ln -s $(prefix)/include $(prefix)/Include + ln -s $(prefix)/etc $(prefix)/Etc tar czf - doc |(cd $(prefix); tar xzf -) + echo TCLINCLUDES=$(TCL_FLAGS) > Directories.temp + echo TCLLIBS =$(TCL_LDFLAGS) -lm -ldl >> Directories.temp + echo X11INCLUDES=$(X11INCLUDES) >> Directories.temp + echo X11LIBS =$(XLIBSW) $(MOTIF_LIBSW) -lXm -lXt -lX11 >> Directories.temp + cat Directories.include >> Directories.temp + $(INSTALL_DATA) Directories.temp $(sysconfdir)/Directories.include + echo CXX=$(CXX) > CompilationRules.temp + echo CC=$(CC) >> CompilationRules.temp + echo CXXLD=$(CXX) >> CompilationRules.temp + echo CCLD=$(CC) >> CompilationRules.temp + cat CompilationRules.include >> CompilationRules.temp + $(INSTALL_DATA) CompilationRules.temp $(sysconfdir)/CompilationRules.include \ No newline at end of file --- NEW FILE: Directories.include --- # # This file contains directory definitions that can be used # by compilation rules. These directories are relative to the # symbol INSTDIR, which is assumed to be the top level # installation directory: # SPECBIN=$(INSTDIR)/bin SPECINCS=$(INSTDIR)/include SPECLIBS=$(INSTDIR)/lib SPECETC=$(INSTDIR)/etc SPECDOCS=$(INSTDIR)/doc SPECCONTRIB=$(INSTDIR)/contrib Index: CHANGELOG =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Attic/CHANGELOG,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** CHANGELOG 5 Apr 2004 20:20:00 -0000 1.1.2.3 --- CHANGELOG 12 Apr 2004 16:37:31 -0000 1.1.2.4 *************** *** 5,7 **** March 31, 2004 - Added -rpath to contrib/scripted Makefile so that LD_LIBRARY_PATH or ld.so.conf not needed. ! April 5, 2004 - Fix issue 118 - low level cutoff display bug. --- 5,11 ---- March 31, 2004 - Added -rpath to contrib/scripted Makefile so that LD_LIBRARY_PATH or ld.so.conf not needed. ! April 5, 2004 - Fix issue 118 - low level cutoff display bug. ! April 12, 2004 - Extract as many defs as possible from skeleton makefiles ! to centrally located include files in order to keep the ! user makefiles constant. ! - Use etc not Etc for etcetera stuff. \ No newline at end of file |