imake is deprecated.
---
libdockapp/README | 3 +--
libdockapp/examples/Makefile.am | 4 ++--
libdockapp/examples/basic/Imakefile | 29 -----------------------------
libdockapp/examples/basic/Makefile | 18 ++++++++++++++++++
libdockapp/examples/rectangles/Imakefile | 20 --------------------
libdockapp/examples/rectangles/Makefile | 18 ++++++++++++++++++
6 files changed, 39 insertions(+), 53 deletions(-)
delete mode 100644 libdockapp/examples/basic/Imakefile
create mode 100644 libdockapp/examples/basic/Makefile
delete mode 100644 libdockapp/examples/rectangles/Imakefile
create mode 100644 libdockapp/examples/rectangles/Makefile
diff --git a/libdockapp/README b/libdockapp/README
index 9607c8f..877dd6d 100644
--- a/libdockapp/README
+++ b/libdockapp/README
@@ -22,11 +22,10 @@ options:
The API is described in dockapp.h
There are some examples in the examples directory. These aren't build by
-default. You will need imake and xmkmf to compile these.
+default.
You can compile them like:
cd examples/basic
- xmkmf -a
make
Optionally you can "make install" if you really like the example application.
diff --git a/libdockapp/examples/Makefile.am b/libdockapp/examples/Makefile.am
index 754f680..227f796 100644
--- a/libdockapp/examples/Makefile.am
+++ b/libdockapp/examples/Makefile.am
@@ -1,9 +1,9 @@
nobase_doc_DATA = README \
- basic/Imakefile \
+ basic/Makefile \
basic/README \
basic/ball_red.xpm \
basic/basic.c \
- rectangles/Imakefile \
+ rectangles/Makefile \
rectangles/rectangles.c
EXTRA_DIST = $(nobase_doc_DATA)
diff --git a/libdockapp/examples/basic/Imakefile
b/libdockapp/examples/basic/Imakefile
deleted file mode 100644
index 3ea51ec..0000000
--- a/libdockapp/examples/basic/Imakefile
+++ /dev/null
@@ -1,29 +0,0 @@
-
-STD_INCLUDES = $(INC_PATH) -I/usr/local/include -I.
-DEPLIBS = $(DEPXLIB)
-
-LOCAL_LIBRARIES = $(LIB_PATH) -L/usr/local/lib -L/usr/X11R6/lib \
- -L../../src/.libs \
- -ldockapp -lXpm -lX11
-
-SRCS = basic.c
-OBJS = basic.o
-
-
-XCOMM -----------------------------------------------------------------------
-XCOMM knowledge about availability of library-functions
-XCOMM -----------------------------------------------------------------------
-
-# Has srandomdev function?
-# + FreeBSD 4.6, OpenBSD 3.1, 4.2BSD, MacOS X
-# - Linux, Solaris, HP UX 11.00
-
-#if defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || \
-defined(NetBSDArchitecture) || defined(DarwinArchitecture)
-CFLAGS += -DHAS_SRANDOMDEV
-#endif
-
-CFLAGS += -DSRANDOMFUNC=$(SRANDOM_FUNC)
-
-ComplexProgramTargetNoMan(basic)
-
diff --git a/libdockapp/examples/basic/Makefile
b/libdockapp/examples/basic/Makefile
new file mode 100644
index 0000000..ea63d6c
--- /dev/null
+++ b/libdockapp/examples/basic/Makefile
@@ -0,0 +1,18 @@
+CC=gcc
+INSTALL=install
+PREFIX=/usr/local
+CFLAGS+=-Wall `pkg-config --cflags dockapp`
+LIBS=`pkg-config --libs dockapp`
+
+basic: basic.o
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+basic.o: basic.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+
+install:
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) basic $(DESTDIR)$(PREFIX)/bin
+
+clean:
+ rm -f basic basic.o
diff --git a/libdockapp/examples/rectangles/Imakefile
b/libdockapp/examples/rectangles/Imakefile
deleted file mode 100644
index 3761d42..0000000
--- a/libdockapp/examples/rectangles/Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-
-STD_INCLUDES = $(INC_PATH) -I/usr/local/include -I.
-DEPLIBS = $(DEPXLIB)
-
-LOCAL_LIBRARIES = $(LIB_PATH) -L/usr/local/lib -L/usr/X11R6/lib \
- -L../../src/.libs \
- -ldockapp -lXpm -lX11
-
-SRCS = rectangles.c
-OBJS = rectangles.o
-
-
-XCOMM -----------------------------------------------------------------------
-XCOMM knowledge about availability of library-functions
-XCOMM -----------------------------------------------------------------------
-
-CFLAGS += -Wall -ansi -pedantic -ggdb
-
-ComplexProgramTargetNoMan(rectangles)
-
diff --git a/libdockapp/examples/rectangles/Makefile
b/libdockapp/examples/rectangles/Makefile
new file mode 100644
index 0000000..34624a7
--- /dev/null
+++ b/libdockapp/examples/rectangles/Makefile
@@ -0,0 +1,18 @@
+CC=gcc
+INSTALL=install
+PREFIX=/usr/local
+CFLAGS+=-Wall `pkg-config --cflags dockapp`
+LIBS=`pkg-config --libs dockapp`
+
+rectangles: rectangles.o
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+rectangles.o: rectangles.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+
+install:
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) rectangles $(DESTDIR)$(PREFIX)/bin
+
+clean:
+ rm -f rectangles rectangles.o
--
2.1.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
