[Uml-devel] uml/uml/codegenerators Makefile.in,1.6,1.7

jriddell at users.sourceforge.net jriddell at users.sourceforge.net
Sat Jul 20 18:38:02 UTC 2002


Update of /cvsroot/uml/uml/uml/codegenerators
In directory usw-pr-cvs1:/tmp/cvs-serv19560

Modified Files:
	Makefile.in 
Log Message:
fixing Paul's incomplete commit


Index: Makefile.in
===================================================================
RCS file: /cvsroot/uml/uml/uml/codegenerators/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	17 Jul 2002 21:55:03 -0000	1.6
--- Makefile.in	21 Jul 2002 01:37:34 -0000	1.7
***************
*** 1,7 ****
  # KDE tags expanded automatically by am_edit - $Revision$ 
! # Makefile.in generated by automake 1.6.2 from Makefile.am.
! # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
  # KDE tags expanded automatically by am_edit - $Revision$ 
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
***************
*** 15,18 ****
--- 14,20 ----
  
  @SET_MAKE@
+ 
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ 
  SHELL = @SHELL@
  
***************
*** 45,55 ****
  AUTOHEADER = @AUTOHEADER@
  
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_HEADER = $(INSTALL_DATA)
--- 47,53 ----
***************
*** 67,74 ****
  target_alias = @target_alias@
  target_triplet = @target@
- 
- EXEEXT = @EXEEXT@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
  AMTAR = @AMTAR@
  AS = @AS@
--- 65,68 ----
***************
*** 87,90 ****
--- 81,85 ----
  DPMSINC = @DPMSINC@
  DPMSLIB = @DPMSLIB@
+ EXEEXT = @EXEEXT@
  GCJ = @GCJ@
  GCJFLAGS = @GCJFLAGS@
***************
*** 115,119 ****
  LEX = @LEX@
  LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBCOMPAT = @LIBCOMPAT@
  LIBCRYPT = @LIBCRYPT@
--- 110,113 ----
***************
*** 165,168 ****
--- 159,163 ----
  NOREPO = @NOREPO@
  OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  PAMLIBS = @PAMLIBS@
***************
*** 230,234 ****
  x_libraries = @x_libraries@
  
- ####### kdevelop will overwrite this part!!! (begin)##########
  lib_LTLIBRARIES = libcodegenerator.la
  
--- 225,228 ----
***************
*** 264,270 ****
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cppwriter.Plo \
! 	@AMDEP_TRUE@	./$(DEPDIR)/factory.Plo ./$(DEPDIR)/javawriter.Plo
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 258,263 ----
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
! @AMDEP_TRUE at DEP_FILES = $(DEPDIR)/cppwriter.Plo $(DEPDIR)/factory.Plo \
! 	@AMDEP_TRUE@	$(DEPDIR)/javawriter.Plo
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 296,299 ****
--- 289,301 ----
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
+ 	-rm -f libtool
  $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  #>- 	cd $(top_srcdir) && \
***************
*** 304,309 ****
  	cd $(top_srcdir) && perl admin/am_edit uml/codegenerators/Makefile.in
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! libLTLIBRARIES_INSTALL = $(INSTALL)
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--- 306,312 ----
  	cd $(top_srcdir) && perl admin/am_edit uml/codegenerators/Makefile.in
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && \
! 	CONFIG_HEADERS= CONFIG_LINKS= \
! 	CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
***************
*** 311,317 ****
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	if test -f $$p; then \
! 	f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
! 	$(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
  	else :; fi; \
  	done
--- 314,319 ----
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	if test -f $$p; then \
! 	echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
! 	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
  	else :; fi; \
  	done
***************
*** 320,324 ****
  	@$(NORMAL_UNINSTALL)
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	p="`echo $$p | sed -e 's|^.*/||'`"; \
  	echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
  	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
--- 322,325 ----
***************
*** 327,336 ****
  clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- 	test -z "$dir" && dir=.; \
- 	echo "rm -f \"$${dir}/so_locations\""; \
- 	rm -f "$${dir}/so_locations"; \
- 	done
  libcodegenerator.la: $(libcodegenerator_la_OBJECTS) $(libcodegenerator_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(libcodegenerator_la_LDFLAGS) $(libcodegenerator_la_OBJECTS) $(libcodegenerator_la_LIBADD) $(LIBS)
--- 328,331 ----
***************
*** 342,351 ****
  	-rm -f *.tab.c
  
! @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cppwriter.Plo at am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/factory.Plo at am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/javawriter.Plo at am__quote@
  
  distclean-depend:
! 	-rm -rf ./$(DEPDIR)
  
  .cpp.o:
--- 337,346 ----
  	-rm -f *.tab.c
  
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cppwriter.Plo at am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/factory.Plo at am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/javawriter.Plo at am__quote@
  
  distclean-depend:
! 	-rm -rf $(DEPDIR)
  
  .cpp.o:
***************
*** 353,357 ****
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  .cpp.obj:
--- 348,352 ----
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
  
  .cpp.obj:
***************
*** 365,388 ****
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  CXXDEPMODE = @CXXDEPMODE@
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
- 	-rm -f libtool
  uninstall-info-am:
  
- ETAGS = etags
- ETAGSFLAGS =
- 
  tags: TAGS
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--- 360,371 ----
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
  CXXDEPMODE = @CXXDEPMODE@
  uninstall-info-am:
  
  tags: TAGS
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
***************
*** 390,394 ****
  	$(AWK) '    { files[$$0] = 1; } \
  	END { for (i in files) print i; }'`; \
! 	mkid -fID $$unique
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
--- 373,377 ----
  	$(AWK) '    { files[$$0] = 1; } \
  	END { for (i in files) print i; }'`; \
! 	mkid -fID $$unique $(LISP)
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
***************
*** 396,400 ****
  	tags=; \
  	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--- 379,383 ----
  	tags=; \
  	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
***************
*** 402,411 ****
  	$(AWK) '    { files[$$0] = 1; } \
  	END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
! 	|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	$$tags $$unique
  
  GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
  	&& cd $(top_srcdir) \
  	&& gtags -i $(GTAGS_ARGS) $$here
--- 385,393 ----
  	$(AWK) '    { files[$$0] = 1; } \
  	END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! 	|| etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
  
  GTAGS:
! 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
  	&& cd $(top_srcdir) \
  	&& gtags -i $(GTAGS_ARGS) $$here
***************
*** 413,416 ****
--- 395,399 ----
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+ 
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
***************
*** 419,436 ****
  
  distdir: $(DISTFILES)
! 	@list='$(DISTFILES)'; for file in $$list; do \
! 	if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	dir="/$$dir"; \
! 	$(mkinstalldirs) "$(distdir)$$dir"; \
! 	else \
! 	dir=''; \
  	fi; \
  	if test -d $$d/$$file; then \
! 	if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	fi; \
! 	cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	else \
  	test -f $(distdir)/$$file \
--- 402,414 ----
  
  distdir: $(DISTFILES)
! 	@for file in $(DISTFILES); do \
! 	if test -f $$file; then d=.; else d=$(srcdir); fi; \
  	dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	$(mkinstalldirs) "$(distdir)/$$dir"; \
  	fi; \
  	if test -d $$d/$$file; then \
! 	cp -pR $$d/$$file $(distdir) \
! 	|| exit 1; \
  	else \
  	test -f $(distdir)/$$file \
***************
*** 457,461 ****
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- 	INSTALL_STRIP_FLAG=-s \
  	`test -z '$(STRIP)' || \
  	echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 435,438 ----
***************
*** 465,469 ****
  
  distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--- 442,446 ----
  
  distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
  
  maintainer-clean-generic:






More information about the umbrello-devel mailing list