use a single Makefile, no recursion

2011-04-26 17:45:41 -07:00
parent 575dc32780
commit 8846b8cad5
26 changed files with 168 additions and 121 deletions
@@ -1,7 +0,0 @@
-INCLUDES = -I../../include -I../../include/openssl
-bin_PROGRAMS    = server
-server_SOURCES  = server.c
-server_LDFLAGS      = -L../../src
-server_LDADD        = ../../src/libcyassl.la
-server_DEPENDENCIES = ../../src/libcyassl.la
-EXTRA_DIST = server.sln *.vcproj
@@ -0,0 +1,11 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+
+bin_PROGRAMS += examples/server/server
+examples_server_server_SOURCES      = examples/server/server.c
+examples_server_server_LDFLAGS      = -Lsrc
+examples_server_server_LDADD        = src/libcyassl.la
+examples_server_server_DEPENDENCIES = src/libcyassl.la
+EXTRA_DIST += examples/server/server.sln examples/server/*.vcproj