Merge branch 'upstream-merged'

2 files changed, 23 insertions, 0 deletions

diff --git a/libdde_linux26/mk/tmpl/server/src/Makefile b/libdde_linux26/mk/tmpl/server/src/Makefile
new file mode 100644
index 00000000..8b0c2471
--- /dev/null
+++ b/libdde_linux26/mk/tmpl/server/src/Makefile
@@ -0,0 +1,18 @@
+PKGDIR		?= ../..
+L4DIR		?= $(PKGDIR)/../..
+
+TARGET		= $(PKGNAME)
+# the default relocation address. This may be superseded by a STATIC file.
+DEFAULT_RELOC	= 0x01800000
+
+# list your .c files here
+SRC_C		= main.c
+
+# if your server implements the server side of an idl defined in an idl-file
+# of your package, list the idl file name(s) here (no path needed)
+SERVERIDL	=
+
+# list additional library paths and libraries here
+LIBS		=
+
+include $(L4DIR)/mk/prog.mk
diff --git a/libdde_linux26/mk/tmpl/server/src/main.c b/libdde_linux26/mk/tmpl/server/src/main.c
new file mode 100644
index 00000000..65eddcf8
--- /dev/null
+++ b/libdde_linux26/mk/tmpl/server/src/main.c
@@ -0,0 +1,5 @@
+
+int main(int argc, char **argv)
+{
+  return 0;
+}