Include libwmgeneral in libdockapp

This patch includes the libwmgeneral library in the libdockapp
library.

The new library is now version 3 (previous was version 2) and it
includes the new include folder in $libdir/libdockapp.

The wmgeneral files were moved from the previous folder (libwmgeneral)
and the folder is now removed.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>

libdockapp/configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libdockapp],[0.6.4],[wmaker-dev@lists.windowmaker.org])
+AC_INIT([libdockapp],[0.7.0],[wmaker-dev@lists.windowmaker.org])
 AC_CONFIG_SRCDIR([src/dockapp.h])
 AM_INIT_AUTOMAKE
 

libdockapp/src/Makefile.am

@@ -3,9 +3,13 @@ AUTOMAKE_OPTIONS = no-dependencies
 
 lib_LTLIBRARIES = libdockapp.la
 
-libdockapp_la_LDFLAGS = -version-info 2:0:0 @X_LIBS@
+libdockapp_la_LDFLAGS = -version-info 3:0:0 @X_LIBS@
 
-include_HEADERS = dockapp.h
+otherincludedir = $(includedir)/libdockapp
+otherinclude_HEADERS = dockapp.h \
+		  wmgeneral.h \
+		  list.h \
+		  misc.h
 
 libdockapp_la_SOURCES = \
 	dockapp.h \
@@ -17,7 +21,10 @@ libdockapp_la_SOURCES = \
 	dapixmap.c \
 	darect.c \
 	dashaped.c \
-	dautil.c
+	dautil.c \
+	list.c \
+	misc.c \
+	wmgeneral.c
 
 # Include these in a distribution, but don't install
 noinst_HEADERS = daargs.h dautil.h

libwmgeneral/Makefile

@@ -1,37 +0,0 @@
-PREFIX = /usr/local
-DESTDIR = $(PREFIX)/lib
-INCDIR = $(PREFIX)/include/wmgeneral
-LIBDIR = -L/usr/X11R6/lib
-LIBS   = -lXpm -lXext -lX11
-TARGET = libwmgeneral.so
-OBJECTS =  wmgeneral.o \
-	misc.o \
-	list.o
-HEADERS = wmgeneral.h \
-	list.h \
-	misc.h
-
-INSTALL = install
-INSTALL_LIB = $(INSTALL)
-
-CFLAGS = -O2 -c -Wall -Werror -fpic
-LDFLAGS = -shared
-CC = cc
-
-.c.o::
-	$(CC) $(CFLAGS) $< -o $*.o
-
-$(TARGET):: $(OBJECTS)
-	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS)
-
-clean::
-	for i in $(OBJECTS) ; do \
-		rm -f $$i;\
-	done
-	rm -f $(TARGET)
-
-install:: $(TARGET)
-	$(INSTALL) -d $(DESTDIR)
-	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)
-	$(INSTALL) -d $(INCDIR)
-	$(INSTALL) -m 644 $(HEADERS) $(INCDIR)