--- trunk/xyz2pov/src/Makefile	2003/04/29 17:45:47	509
+++ trunk/xyz2pov/src/Makefile	2003/07/24 15:50:41	649
@@ -22,25 +22,23 @@ POV2ANIM=pov2anim$(EXE)
 DEPFLAGS=$(CFLAGS_C) -I.
 
 XYZ2POV=xyz2pov$(EXE)
-POV2ANIM=pov2anim$(EXE)
 
 POVTOOLS_LIB = libpovtools.a
 
 XYZ2POV_LDFLAGS= -L.
 XYZ2POV_LDADD= -lpovtools -lm
 
-POV2ANIM_LDFLAGS= -L.
-POV2ANIM_LDADD= -lpovtools -lm
-
 PREFS=-DXYZ2POV_HOME="$(XYZ2POV_HOME)"
 
 # Then do the compile rules:
 
+SRCPATH=$(PWD)
+
 obj/%.o: %.cpp
-	cd obj; $(CXX) $(CXXFLAGS) -c ../$<
+	cd obj; $(CXX) $(CXXFLAGS) -c $(SRCPATH)/$<
 
 obj/%.o: %.c
-	cd obj; $(CC) $(CFLAGS) -c ../$<
+	cd obj; $(CC) $(CFLAGS) -c $(SRCPATH)/$<
 
 # Then list what we have to compile
 
@@ -56,11 +54,6 @@ ANIMC_FILES = \
 
 XYZCXX_FILES = 
 
-ANIMC_FILES = \
-	$(DIR)/pov2anim.c
-
-ANIMCXX_FILES = 
-
 DIR:=.
 LIBC_SRCS   :=   $(LIBC_FILES)
 LIBCXX_SRCS :=	 $(LIBCXX_FILES)
@@ -71,13 +64,8 @@ DIR:=.
 XYZCXX_SRCS :=	$(XYZCXX_FILES)
 XYZ_SRCS    :=  $(XYZC_SRCS) $(XYZCXX_SRCS)
 
-DIR:=.
-ANIMC_SRCS   :=  $(ANIMC_FILES)
-ANIMCXX_SRCS :=	 $(ANIMCXX_FILES)
-ANIM_SRCS    :=  $(ANIMC_SRCS) $(ANIMCXX_SRCS)
+SRCS := $(LIB_SRCS) $(XYZ_SRCS)
 
-SRCS := $(LIB_SRCS) $(XYZ_SRCS) $(ANIM_SRCS)
-
 DIR:=obj
 LIBC_OBJS   :=     $(LIBC_FILES:.c=.o)
 LIBCXX_OBJS :=	   $(LIBCXX_FILES:.cpp=.o)
@@ -88,47 +76,33 @@ DIR:=obj
 XYZCXX_OBJS :=	$(XYZCXX_FILES:.cpp=.o)
 XYZ_OBJS    :=  $(XYZC_OBJS) $(XYZCXX_OBJS)
 
-DIR:=obj
-ANIMC_OBJS   :=   $(ANIMC_FILES:.c=.o)
-ANIMCXX_OBJS :=	  $(ANIMCXX_FILES:.cpp=.o)
-ANIM_OBJS    :=   $(ANIMC_OBJS) $(ANIMCXX_OBJS)
-
 LIBSUBDIRS = obj
 
-all : Make.dep $(POVTOOLS_LIB) $(POV2ANIM) $(XYZ2POV)
+all : Make.dep $(POVTOOLS_LIB) $(XYZ2POV)
 
 depend: Make.dep
 
 libpovtools.a: $(LIB_OBJS)
 	$(RM) $@
-	$(AR) cr $@ $(OBJS)
+	$(AR) cr $@ $(LIB_OBJS)
 	$(RANLIB) $@
 
 xyz2pov$(EXE) : $(XYZ_OBJS) $(POVTOOLS_LIB)
 	$(CC) $(CFLAGS) $(XYZ_OBJS) -o $@ $(XYZ2POV_LDFLAGS) $(XYZ2POV_LDADD)
 
-pov2anim$(EXE) : $(ANIM_OBJS) $(POVTOOLS_LIB)
-	$(CC) $(CFLAGS) $(ANIM_OBJS) -o $@ $(POV2ANIM_LDFLAGS) $(POV2ANIM_LDADD)
-
-install :  $(POV2ANIM) $(XYZ2POV)
+install : $(XYZ2POV)
 	$(MKINSTALLDIRS) $(XYZ2POV_HOME)/bin
 	$(INSTALL_PROGRAM) -s $(XYZ2POV) $(XYZ2POV_HOME)/bin/$(XYZ2POV)
-	$(INSTALL_PROGRAM) -s $(POV2ANIM) $(XYZ2POV_HOME)/bin/$(POV2ANIM)
 
 tests : dummy
 
 $(XYZ2POV_HOME)/bin/$(XYZ2POV) : $(XYZ2POV)
 	$(MAKE) install
 
-$(XYZ2POV_HOME)/bin/$(POV2ANIM) : $(POV2ANIM)
-	$(MAKE) install
-
-links : $(XYZ2POV_HOME)/bin/$(XYZ2POV) $(XYZ2POV_HOME)/bin/$(POV2ANIM)
+links : $(XYZ2POV_HOME)/bin/$(XYZ2POV)
 	$(MKINSTALLDIRS) $(PREFIX)/bin
 	cd $(PREFIX)/bin; $(RM) $(XYZ2POV); $(LN_S) $(XYZ2POV_HOME)/bin/$(XYZ2POV) $(XYZ2POV)
-	cd $(PREFIX)/bin; $(RM) $(POV2ANIM); $(LN_S) $(XYZ2POV_HOME)/bin/$(POV2ANIM) $(POV2ANIM)
 
-
 # cleaning
 
 .PHONY : clean
@@ -137,13 +111,13 @@ clean : dummy
 	for i in $(LIBSUBDIRS); do \
 	  (cd $$i; $(RM) *.o) || exit 1; \
 	done
-	$(RM) $(POVTOOLS_LIB) $(XYZ2POV) $(ANIM2POV) *.o *~ Make.temp
+	$(RM) $(POVTOOLS_LIB) $(XYZ2POV) *.o *~ Make.temp
 
 distclean : dummy
 	for i in $(LIBSUBDIRS); do \
 	  (cd $$i; $(RM) *.o) || exit 1; \
 	done
-	$(RM) $(POVTOOLS_LIB) $(XYZ2POV) $(ANIM2POV) *.o *~ Make.temp Make.dep
+	$(RM) $(POVTOOLS_LIB) $(XYZ2POV) *.o *~ Make.temp Make.dep
 
 devclean : distclean
 
@@ -151,7 +125,7 @@ Make.dep : $(SRCS)
 	echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
 	$(CC) $(DEPFLAGS) -MM $(SRCS) \
 		| sed 's/\.o:/\$$(O)\ :/g' > Make.temp
-	cat Make.temp | sed 's/^/obj\//' >> Make.dep
+	cat Make.temp | sed 's/^[0-9a-zA-Z]/obj\/&/' >> Make.dep
 	$(RM) Make.temp
 
 tags : $(SRCS)