Merge ../paraslash.fml/paraslash

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6572235..7d692a7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,7 +48,7 @@ CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wshadow
 
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wshadow
 

-BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter para_write @extra_binaries@
+BINARIES = para_server para_client para_gui para_audioc para_recv para_filter para_write @extra_binaries@

 
 FONTS := $(wildcard fonts/*.png)
 PICS := $(wildcard pics/paraslash/*.jpg)
 
 FONTS := $(wildcard fonts/*.png)
 PICS := $(wildcard pics/paraslash/*.jpg)


@@ -148,6 +148,12 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
                --set-package="para_$(subst .cmdline,,$(*F))" \
                --set-version="$V"  < $<
 
                --set-package="para_$(subst .cmdline,,$(*F))" \
                --set-version="$V"  < $<
 

+ortp_recv.o: ortp_recv.c
+       $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
+
+ortp_send.o: ortp_send.c
+       $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
+

 mp3dec.o: mp3dec.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 
 mp3dec.o: mp3dec.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 


@@ -229,14 +235,15 @@ maintainer-clean: distclean
 
 install: all
        umask 022 && \
 
 install: all
        umask 022 && \

-       mkdir -p $(BINDIR) $(VARDIR) && \
+       mkdir -p $(BINDIR) && \

        $(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
        mkdir -p $(FONTDIR) && \
        $(install_sh) -m 644 $(FONTS) $(FONTDIR) && \
        mkdir -p $(PICDIR) && \
        $(install_sh) -m 644 $(PICS) $(PICDIR) && \
        mkdir -p $(MANDIR) && \
        $(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
        mkdir -p $(FONTDIR) && \
        $(install_sh) -m 644 $(FONTS) $(FONTDIR) && \
        mkdir -p $(PICDIR) && \
        $(install_sh) -m 644 $(PICS) $(PICDIR) && \
        mkdir -p $(MANDIR) && \

-       $(install_sh) -m 644 $(MANS) $(MANDIR)
+       $(install_sh) -m 644 $(MANS) $(MANDIR) \
+       mkdir -p $(VARDIR) > /dev/null 2>&1 || exit 0

 
 @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) doc
        rm -f $(tarball_pfx).tar.bz2
 
 @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) doc
        rm -f $(tarball_pfx).tar.bz2