remove mem leaks

[lyx.git] / forms / makefile

diff --git a/forms/makefile b/forms/makefile
index 99dcce6f86edfa6113c29e173179f184012c1fe7..79bb9e99263f19738743ebf09b079903dce21131 100644 (file)
--- a/forms/makefile
+++ b/forms/makefile
@@ -17,16 +17,16 @@ SHELL = /bin/sh
 # Various commands
 FDESIGN = fdesign
 
-SRCS = bullet_forms.fd credits_form.fd form1.fd \
-       latexoptions.fd layout_forms.fd lyx.fd lyx_sendfax.fd math_forms.fd \
+SRCS = bibforms.fd credits_form.fd form1.fd include_form.fd \
+       log_form.fd lyx.fd math_forms.fd \
        print_form.fd sp_form.fd
 
-OBJS = bullet_forms.c credits_form.c form1.c \
-       latexoptions.c layout_forms.c lyx.c lyx_sendfax.c math_forms.c \
+OBJS = bibforms.c credits_form.c form1.c include_form.c \
+       log_form.c lyx.c math_forms.c \
        print_form.c sp_form.c
 
-COBJS = bullet_forms.C credits_form.C form1.C \
-       latexoptions.C layout_forms.C lyx.C lyx_sendfax.C math_forms.C \
+COBJS = bibforms.C credits_form.C form1.C include_form.C \
+       log_form.C lyx.C math_forms.C \
        print_form.C sp_form.C
 
 all:
@@ -43,14 +43,20 @@ d: c $(COBJS)
 #
 # We need the callbacks to all be declared as:  extern "C" void
 #
+# -e 's,\(generated with fdesign\)\(.*\)\(\*\*/\),\1 \3,';\
+#
+# Clean up the line with the date in it.  This means we'll have fewer false
+# updates (where the only thing that changed was the date).
+#
 e: c
        for hfil in *.h ; do \
                if [ -f "$$hfil.patch" ] ; then \
                        (echo "Patching $$hfil with $$hfil.patch" ; \
-                       patch -s $$hfil < $$hfil.patch) \
+                       patch $$hfil < $$hfil.patch) \
                fi; \
                sed < $$hfil > $$hfil.tmp \
-                       -e 's/\(extern\) \(void.*FL_OBJECT\)/\1 "C" \2/' ; \
+                       -e 's/\(extern\) \(void.*FL_OBJECT\)/\1 "C" \2/' \
+                       -e 's,\(generated with fdesign\)\(.*\)\(\*\*/\),\1 \3,';\
                mv $$hfil.tmp $$hfil; \
        done
 
@@ -62,9 +68,9 @@ updatesrc: d e
        @echo "get junk code and errors at compile time.">&2
        for fil in *.C *.h ; do \
                if [ $$fil = "math_forms.C" -o $$fil = "math_forms.h" ]; then \
-                       cp $$fil ../src/mathed ; \
+                       cmp -s $$fil ../src/mathed/$$fil || cp $$fil ../src/mathed ; \
                else \
-                       cp $$fil ../src ; \
+                       cmp -s $$fil ../src/$$fil || cp $$fil ../src ; \
                fi \
        done