From 36d1bb8999ecfe305319c0f2b4313a169a368c13 Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Sun, 13 Apr 2008 22:10:04 +0000
Subject: zoomedit: * Changed CPPFLAGS and LIBS handling * Added cross and dot
 product to Vector class * Added View classes

---
 src/Util/Makefile.am |  2 +-
 src/Util/Makefile.in | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/Util')

diff --git a/src/Util/Makefile.am b/src/Util/Makefile.am
index 021ae0b..8f3d71d 100644
--- a/src/Util/Makefile.am
+++ b/src/Util/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES  = libutil.la
 
 libutil_la_SOURCES  = Xml.cpp
-libutil_la_CPPFLAGS = $(libxml_CFLAGS)
+
diff --git a/src/Util/Makefile.in b/src/Util/Makefile.in
index 7eb4e2b..75644e2 100644
--- a/src/Util/Makefile.in
+++ b/src/Util/Makefile.in
@@ -43,7 +43,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libutil_la_LIBADD =
-am_libutil_la_OBJECTS = libutil_la-Xml.lo
+am_libutil_la_OBJECTS = Xml.lo
 libutil_la_OBJECTS = $(am_libutil_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -81,6 +81,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -106,6 +107,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -178,7 +180,6 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libutil.la
 libutil_la_SOURCES = Xml.cpp
-libutil_la_CPPFLAGS = $(libxml_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -230,7 +231,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutil_la-Xml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xml.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -253,13 +254,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
-libutil_la-Xml.lo: Xml.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libutil_la-Xml.lo -MD -MP -MF $(DEPDIR)/libutil_la-Xml.Tpo -c -o libutil_la-Xml.lo `test -f 'Xml.cpp' || echo '$(srcdir)/'`Xml.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libutil_la-Xml.Tpo $(DEPDIR)/libutil_la-Xml.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Xml.cpp' object='libutil_la-Xml.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libutil_la-Xml.lo `test -f 'Xml.cpp' || echo '$(srcdir)/'`Xml.cpp
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
-- 
cgit v1.2.3