--- trunk/xyz2pov/src/Makefile	2002/08/01 21:12:33	61
+++ trunk/xyz2pov/src/Makefile	2003/04/29 17:45:47	509
@@ -1,24 +1,163 @@
-CC=gcc
-BIN=$(HOME)/bin
-CFLAGS=-Wall
+#####################################################
+# Makefile for xyz2pov                              #
+#####################################################
+# You should not change anything here.              #
+#####################################################
 
-all: $(BIN)/xyz2pov $(BIN)/pov2anim
+TOP=..
 
-$(BIN)/pov2anim: pov2anim.o
-	$(CC) -o $(BIN)/pov2anim pov2anim.o -lm
+include $(TOP)/Make.conf
 
-$(BIN)/xyz2pov: xyz2pov.o atom_parser.o pov_writer.o frameCount.o
-	$(CC) -o $(BIN)/xyz2pov xyz2pov.o atom_parser.o pov_writer.o frameCount.o -lm
+.SUFFIXES : .cpp .c .h .hpp $(O)
 
-atom_parser.o: atom_parser.c atom_parser.h
+# First do compile-time flags:
 
-pov_writer.o: pov_writer.c pov_writer.h atom_parser.h
+DECLARES= -DTYPES_PATH="$(ATOMTYPES_DIR)"
 
-pov2anim.o: pov2anim.c
+# include paths starting with "." are all relative to the SUBDIRS!!!
 
-frameCount.o: frameCount.h frameCount.c
+INCLUDES= -I.. 
+CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
+CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
+DEPFLAGS=$(CFLAGS_C) -I.
 
-xyz2pov.o: pov_writer.h atom_parser.h xyz2pov.c
+XYZ2POV=xyz2pov$(EXE)
+POV2ANIM=pov2anim$(EXE)
 
-clean:
-	rm *.o *~
+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:
+
+obj/%.o: %.cpp
+	cd obj; $(CXX) $(CXXFLAGS) -c ../$<
+
+obj/%.o: %.c
+	cd obj; $(CC) $(CFLAGS) -c ../$<
+
+# Then list what we have to compile
+
+LIBC_FILES = \
+	$(DIR)/atom_parser.c \
+	$(DIR)/frameCount.c \
+	$(DIR)/pov_writer.c
+
+LIBCXX_FILES = 
+
+XYZC_FILES = \
+	$(DIR)/xyz2pov.c
+
+XYZCXX_FILES = 
+
+ANIMC_FILES = \
+	$(DIR)/pov2anim.c
+
+ANIMCXX_FILES = 
+
+DIR:=.
+LIBC_SRCS   :=   $(LIBC_FILES)
+LIBCXX_SRCS :=	 $(LIBCXX_FILES)
+LIB_SRCS    :=   $(LIBC_SRCS) $(LIBCXX_SRCS)
+
+DIR:=.
+XYZC_SRCS   :=  $(XYZC_FILES)
+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) $(ANIM_SRCS)
+
+DIR:=obj
+LIBC_OBJS   :=     $(LIBC_FILES:.c=.o)
+LIBCXX_OBJS :=	   $(LIBCXX_FILES:.cpp=.o)
+LIB_OBJS    :=     $(LIBC_OBJS) $(LIBCXX_OBJS)
+
+DIR:=obj
+XYZC_OBJS   :=  $(XYZC_FILES:.c=.o)
+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)
+
+depend: Make.dep
+
+libpovtools.a: $(LIB_OBJS)
+	$(RM) $@
+	$(AR) cr $@ $(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)
+	$(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)
+	$(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
+
+clean : dummy
+	for i in $(LIBSUBDIRS); do \
+	  (cd $$i; $(RM) *.o) || exit 1; \
+	done
+	$(RM) $(POVTOOLS_LIB) $(XYZ2POV) $(ANIM2POV) *.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
+
+devclean : distclean
+
+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
+	$(RM) Make.temp
+
+tags : $(SRCS)
+	ctags $(SRCS)
+
+dummy :
+
+# DO NOT DELETE
+include Make.dep