X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=d7640b6c3782cfb577b0067230b7b8cc9565021a;hp=3fbbce21ab5f3fe91d674750a4d3f7804c346188;hb=ae7a5e56804fcb6789b5512201cacb6f29b2fb7b;hpb=7584638594109184f329bead008f1dcdd9030767

diff --git a/Makefile.in b/Makefile.in
index 3fbbce21..d7640b6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,7 @@ PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
 cmdline_dir := @cmdline_dir@
+executables := @executables@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -53,7 +54,6 @@ CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
-CPPFLAGS += @SSL_CPPFLAGS@
 CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
 CPPFLAGS += -I/usr/local/include
@@ -67,6 +67,7 @@ man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
 ggo_dir := ggo
 object_dir := objects
 man_dir := man/man1
+test_dir := t
 
 m4_ggos := afh audioc audiod client filter gui recv server write
 all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
@@ -93,15 +94,16 @@ endif
 ifndef BUILD_VERBOSE
 	BUILD_VERBOSE = 0
 endif
-ifeq ($(BUILD_VERBOSE),1)
-	Q =
-else
+ifeq ($(BUILD_VERBOSE),0)
 	Q = @
+else
+	Q =
 endif
 
-.PHONY: all clean distclean maintainer-clean install man tarball\
+.PHONY: dep all clean distclean maintainer-clean install man tarball\
 	.FORCE-GIT-VERSION-FILE
-all: @executables@ $(man_pages)
+all: dep @executables@ $(man_pages)
+dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
@@ -153,6 +155,9 @@ $(object_dir):
 $(man_dir):
 	mkdir -p $@
 
+$(object_dir)/crypt.o: crypt.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @openssl_cppflags@ $<
 $(object_dir)/spx_common.o: spx_common.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
@@ -224,8 +229,10 @@ all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
 	$(write_objs) $(afh_objs)
 
+deps := $(all_objs:.o=.d)
+
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
--include $(all_objs:.o=.d)
+-include $(deps)
 endif
 
 para_recv: $(recv_objs)
@@ -277,7 +284,7 @@ clean2: clean
 	$(Q) rm -rf man $(object_dir)
 	$(Q) rm -f *_command_list.*
 
-distclean: clean2
+distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
 	$(Q) rm -rf autom4te.cache aclocal.m4
@@ -313,3 +320,4 @@ $(tarball): $(cmdline_generated)
 %.pdf: %.ps
 	ps2pdf - - < $< > $@
 
+include $(test_dir)/makefile.test