From: Enlightenment S. <no-...@en...> - 2010-12-05 21:16:49
|
Log: fix make dist Author: discomfitor Date: 2010-12-05 13:16:42 -0800 (Sun, 05 Dec 2010) New Revision: 55293 Trac: http://trac.enlightenment.org/e/changeset/55293 Modified: trunk/PROTO/azy/Makefile.am trunk/PROTO/azy/src/tests/Makefile.am Modified: trunk/PROTO/azy/Makefile.am =================================================================== --- trunk/PROTO/azy/Makefile.am 2010-12-05 21:02:34 UTC (rev 55292) +++ trunk/PROTO/azy/Makefile.am 2010-12-05 21:16:42 UTC (rev 55293) @@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h* config.sub \ configure depcomp install-sh ltmain.sh missing compile m4/l* -CLEANFILES = azy-*-doc.tar.bz2 +CLEANFILES = azy-*.tar.bz2 azy-*.tar.gz maintainer-clean-local: rm -rf autom4te.cache Modified: trunk/PROTO/azy/src/tests/Makefile.am =================================================================== --- trunk/PROTO/azy/src/tests/Makefile.am 2010-12-05 21:02:34 UTC (rev 55292) +++ trunk/PROTO/azy/src/tests/Makefile.am 2010-12-05 21:16:42 UTC (rev 55293) @@ -1,34 +1,60 @@ SUBDIRS = unit -MYSQL_S = \ +if HAVE_MYSQL +MYSQL_COMMON_S = T_SQL.h +else +MYSQL_COMMON_S = +endif + +COMMON_S = \ + T_Common.h \ + T_Common.c \ + T_Test1.h \ + T_Test2.h + +if HAVE_MYSQL +MYSQL_SERVER_S = \ T_SQL.azy_server.c \ - T_SQL.azy_client.c \ T_SQL.azy_server_stubs.c \ T_SQL.azy_server.h \ - T_SQL.azy_client.h \ - T_SQL.azy_server_stubs.h \ - T_SQL.h + T_SQL.azy_server_stubs.h +else +MYSQL_SERVER_S = +endif -BUILT_SOURCES = \ - $(MYSQL_S) \ - T_Common.h \ - T_Common.c \ +SERVER_S = \ T_Test1.azy_server.c \ - T_Test1.azy_client.c \ T_Test1.azy_server_stubs.c \ T_Test1.azy_server.h \ - T_Test1.azy_client.h \ T_Test1.azy_server_stubs.h \ - T_Test1.h \ T_Test2.azy_server.c \ - T_Test2.azy_client.c \ T_Test2.azy_server_stubs.c \ T_Test2.azy_server.h \ - T_Test2.azy_client.h \ - T_Test2.azy_server_stubs.h \ - T_Test2.h + T_Test2.azy_server_stubs.h +if HAVE_MYSQL +MYSQL_CLIENT_S = \ + T_SQL.azy_client.c \ + T_SQL.azy_client.h +else +MYSQL_CLIENT_S = +endif +CLIENT_S = \ + T_Test1.azy_client.c \ + T_Test1.azy_client.h \ + T_Test2.azy_client.c \ + T_Test2.azy_client.h + + +BUILT_SOURCES = \ + $(COMMON_S) \ + $(MYSQL_COMMON_S) \ + $(CLIENT_S) \ + $(MYSQL_CLIENT_S) \ + $(SERVER_S) \ + $(MYSQL_SERVER_S) + EXTRA_DIST = \ test.azy \ server.pem @@ -54,17 +80,27 @@ stress_client \ server -client_SOURCES = \ +nodist_client_SOURCES = \ client.c \ - $(BUILT_SOURCES) + $(COMMON_SOURCES) \ + $(MYSQL_COMMON_S) \ + $(CLIENT_SOURCES) \ + $(MYSQL_CLIENT_S) -stress_client_SOURCES = \ + +nodist_stress_client_SOURCES = \ stress_client.c \ - $(BUILT_SOURCES) + $(COMMON_SOURCES) \ + $(MYSQL_COMMON_S) \ + $(CLIENT_SOURCES) \ + $(MYSQL_CLIENT_S) -server_SOURCES = \ +nodist_server_SOURCES = \ server.c \ - $(BUILT_SOURCES) + $(COMMON_SOURCES) \ + $(MYSQL_COMMON_S) \ + $(SERVER_SOURCES) \ + $(MYSQL_SERVER_S) $(BUILT_SOURCES): .sources-ts |