6 files changed, 17 insertions, 34 deletions
diff --git a/debian/additions/examples/c++/debian.Makefile b/debian/additions/examples/c++/debian.Makefile
new file mode 100644
index 0000000..bcd48bb
--- /dev/null
+++ b/debian/additions/examples/c++/debian.Makefile
@@ -0,0 +1,5 @@
+all: example1 example2 example3 example4
+
+LOADLIBES += $(shell pkg-config libconfig++ --libs)
+CXXFLAGS += -Wall
+CXXFLAGS += -O2
diff --git a/debian/additions/examples/c/debian.Makefile b/debian/additions/examples/c/debian.Makefile
new file mode 100644
index 0000000..a5e28bd
--- /dev/null
+++ b/debian/additions/examples/c/debian.Makefile
@@ -0,0 +1,5 @@
+all: example1 example2 example3
+
+LOADLIBES += $(shell pkg-config libconfig --libs)
+CFLAGS += -Wall
+CFLAGS += -O2
diff --git a/debian/additions/sample.c++.Makefile b/debian/additions/sample.c++.Makefile
deleted file mode 100644
index 0d9cef2..0000000
--- a/debian/additions/sample.c++.Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Makefile for libconfig++ - examples
-
-
-sample1:	sample1.cpp
-	$(CC) -o $@ -lconfig++ -lconfig $<
-
-sample2:	sample2.cpp
-	$(CC) -o $@ -lconfig++ -lconfig $<
-
-sample3:	sample3.cpp
-	$(CC) -o $@ -lconfig++ -lconfig $<
-
-
-stub:		stubcpp.cpp
-	$(CC) -o $@ -lconfig++ -lconfig $<
diff --git a/debian/additions/sample.c.Makefile b/debian/additions/sample.c.Makefile
deleted file mode 100644
index bf2f8f5..0000000
--- a/debian/additions/sample.c.Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Makefile for libconfig - examples
-
-
-sample1:	sample1.c
-	$(CC) -o $@ -lconfig $<
-
-sample2:	sample2.c
-	$(CC) -o $@ -lconfig $<
-
-sample3:	sample3.c
-	$(CC) -o $@ -lconfig $<
-
-
-stub:		stub.c
-	$(CC) -o $@ -lconfig $<
diff --git a/debian/libconfig++-dev.examples b/debian/libconfig++-dev.examples
index b2c7675..4247368 100644
--- a/debian/libconfig++-dev.examples
+++ b/debian/libconfig++-dev.examples
@@ -1,2 +1,4 @@
-samples/c++/*.cpp
-debian/additions/sample.c++.Makefile
+examples/c+/example.cfg
+examples/c+/invalid.cfg
+examples/c+/example*.cpp
+debian/additions/examples/c++/debian.Makefile
diff --git a/debian/libconfig-dev.examples b/debian/libconfig-dev.examples
index 306ccd5..af50e71 100644
--- a/debian/libconfig-dev.examples
+++ b/debian/libconfig-dev.examples
@@ -1,2 +1,3 @@
-samples/c/*.c
-debian/additions/sample.c.Makefile
-\ No newline at end of file
+examples/c/example.cfg
+examples/c/example*.c
+debian/additions/examples/c/debian.Makefile