From a9cdceebebdb81217399c8f1b1fc99a9e9782557 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Mon, 16 Jul 2001 20:58:56 +0000
Subject: [PATCH] $(TOPDIR), make, tmpl/tex/en_technical: Make the uclient
 examples work

---
 Makefile                                 |  2 +-
 make/defs-orig.mk                        |  6 +++---
 make/rules.mk                            |  8 +++----
 tmpl/tex/en_technical/frontpage.tex.tmpl | 27 ++++++++++++++++--------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index d503cada..5db98939 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 TOPDIR=.
 CLEAN = include lib
-SUBDIRS = $(shell find . -type d -maxdepth 1 | grep -ve "include\|CVS\|lib" | grep /)
+SUBDIRS = $(shell find . -type d -maxdepth 1 | grep -ve "include\|CVS\|lib\|nomake" | grep /)
 include $(TOPDIR)/make/dirs.mk
diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 408d4c27..6ae65e06 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -24,16 +24,16 @@ MEMBERS     = $(LIB)($(OBJ))
 PREFIX      = ../
 #MEMWATCH    = -DMEMWATCH -DMW_STDIO
 #YAMD        = yamd-
-
+EFENCE      = -lefence
 #CFLAGS    = -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
 CFLAGS    = -Wall -D_DEBUG_ $(MEMWATCH) -g $(INCLUDE) $(LOCAL_CFLAGS)
 CPPFLAGS  = -Wall -D_DEBUG_ $(MEMWATCH) -g $(INCLUDE) $(LOCAL_CPPFLAGS)
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
-LDFLAGS   = -L$(LIBDIR) -l$(LIBNAME) -lg++
+LDFLAGS   = -L$(LIBDIR) $(EFENCE) -l$(LIBNAME) -lg++
 LDREST    = -ldl $(LDAUDIO) $(LDFFTW) $(LOCAL_LDFLAGS)
 CC        = $(YAMD)gcc
-CPP       = c++
+CPP       = $(YAMD)g++
 RM        = rm
 AR        = ar
 INSTALL   = install
diff --git a/make/rules.mk b/make/rules.mk
index 97835860..1b917a00 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -26,12 +26,12 @@ $(TOPDIR)/include:
 $(TOPDIR)/include/%.h:%.h $(TOPDIR)/include
 	cp $< $@
 
-%.o: %.c %.h
-	$(CC) $(CFLAGS) -c $<
-
-%.o: %.cc %h
+%.o: %.cpp
 	$(CPP) $(CPPFLAGS) -c $<
 
+%.o: %.c
+	$(CC) $(CFLAGS) -c $<
+
 $(EXE): $(OBJ) $(LIB)
 	$(CC) $(OBJ) $(LDFLAGS) -o $@ 
 
diff --git a/tmpl/tex/en_technical/frontpage.tex.tmpl b/tmpl/tex/en_technical/frontpage.tex.tmpl
index b178dd93..c5955bf5 100644
--- a/tmpl/tex/en_technical/frontpage.tex.tmpl
+++ b/tmpl/tex/en_technical/frontpage.tex.tmpl
@@ -30,6 +30,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \thispagestyle{empty}
 
+\begin{figure}[t]
+\begin{flushright}
+%\begin{minipage}[t]{8cm}
+%\includegraphics[width=6cm,height=3cm]{__FRONTLOGO_EPS__}
+\includegraphics{__FRONTLOGO_EPS__}
+%%\end{minipage}
+\end{flushright}
+\end{figure}
+
 \begin{center}
 \fbox{
 \parbox[t]{15cm}
@@ -48,24 +57,24 @@
 
 \vspace{3cm} 
 
-\centerline{\large \bf __DATE__}
+\centerline{\Large __DATE__}
 
 \vspace{0.3cm} 
 
-\centerline{\large \bf Document Version: __VERSION__}
+\centerline{\Large Document Version: __VERSION__}
 
 \vspace{0.3cm} 
 
 \end{center}
 
 \begin{figure}[b]
+\begin{flushright}
 \begin{minipage}[b]{8cm}
-{\large \bf __AUTHORS__}
-
-\end{minipage}
-\hfill
-\begin{minipage}[b]{8cm}
-%\includegraphics[width=6cm,height=3cm]{__FRONTLOGO_EPS__}
-\includegraphics{__FRONTLOGO_EPS__}
+\begin{flushright}
+{\Large __AUTHORS__}
+\end{flushright}
 \end{minipage}
+\end{flushright}
 \end{figure}
+
+