Rename lib to libirc.

diff --git a/Makefile b/Makefile
index dd73c67a2a4133b1e1aefaf31eba13e33a071f8c..53cdc80f9467edd12c65c05326ed2ede4847054f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ctrlproxy
-# Copyright (C) 2002-2008 Jelmer Vernooij <jelmer@samba.org>
+# Copyright (C) 2002-2009 Jelmer Vernooij <jelmer@samba.org>
 # NOTE: This file is *NOT* autogenerated.
 
 include Makefile.settings
@@ -36,16 +36,7 @@ experimental:: all
 doxygen:
        doxygen
 
-lib_objs = \
-          lib/state.o \
-          lib/client.o \
-          lib/transport.o \
-          lib/line.o \
-          lib/isupport.o \
-          lib/connection.o \
-          lib/url.o \
-          lib/util.o \
-          lib/listener.o
+libircdir = libirc
 
 objs = src/posix.o \
           src/cache.o \
@@ -77,16 +68,27 @@ objs = src/posix.o \
           src/network.o \
           $(SSL_OBJS)
 
-lib_headers = \
-                 lib/state.h \
-                 lib/client.h \
-                 lib/line.h \
-                 lib/isupport.h \
-                 lib/irc.h \
-                 lib/connection.h \
-                 lib/url.h \
-                 lib/listener.h \
-                 lib/util.h
+libirc_objs = \
+          $(libircdir)/state.o \
+          $(libircdir)/client.o \
+          $(libircdir)/transport.o \
+          $(libircdir)/line.o \
+          $(libircdir)/isupport.o \
+          $(libircdir)/connection.o \
+          $(libircdir)/url.o \
+          $(libircdir)/util.o \
+          $(libircdir)/listener.o
+
+libirc_headers = \
+                 $(libircdir)/state.h \
+                 $(libircdir)/client.h \
+                 $(libircdir)/line.h \
+                 $(libircdir)/isupport.h \
+                 $(libircdir)/irc.h \
+                 $(libircdir)/connection.h \
+                 $(libircdir)/url.h \
+                 $(libircdir)/listener.h \
+                 $(libircdir)/util.h
 
 headers = src/admin.h \
                  src/ctcp.h \
@@ -127,10 +129,10 @@ ctrlproxy-admin$(EXEEXT): src/admin-cmd.o
 
 %.o: %.c
        @echo Compiling $<
-       @$(CC) -I. -Ilib -Isrc $(CFLAGS) $(GCOV_CFLAGS) -c $< -o $@
+       @$(CC) -I. -I$(libircdir) -Isrc $(CFLAGS) $(GCOV_CFLAGS) -c $< -o $@
 
 %.d: %.c config.h
-       @$(CC) -I. -Ilib -Isrc -M -MT $(<:.c=.o) $(CFLAGS) $< -o $@
+       @$(CC) -I. -I$(libircdir) -Isrc -M -MT $(<:.c=.o) $(CFLAGS) $< -o $@
 
 # This looks a bit weird but is here to ensure that we never try to 
 # run ./autogen.sh outside of bzr checkouts
@@ -165,12 +167,12 @@ install-bin:
        $(INSTALL) $(SBINS) $(DESTDIR)$(sbindir)
 
 uninstall-header:
-       -rm -f $(patsubst %,$(DESTDIR)$(destincludedir)/%,$(notdir $(headers) $(lib_headers)))
+       -rm -f $(patsubst %,$(DESTDIR)$(destincludedir)/%,$(notdir $(headers) $(libirc_headers)))
        -rmdir $(DESTDIR)$(destincludedir)
 
 install-header::
        $(INSTALL) -d $(DESTDIR)$(destincludedir)
-       $(INSTALL) -m 0644 $(lib_headers) $(headers) $(DESTDIR)$(destincludedir)
+       $(INSTALL) -m 0644 $(libirc_headers) $(headers) $(DESTDIR)$(destincludedir)
 
 doc::
        $(MAKE) -C doc PACKAGE_VERSION=$(PACKAGE_VERSION)
@@ -210,11 +212,11 @@ lcov:
        lcov --base-directory `pwd` --directory . --capture --output-file ctrlproxy.info
        genhtml -o coverage ctrlproxy.info
 
-$(LIBIRC_STATIC): $(lib_objs)
+$(LIBIRC_STATIC): $(libirc_objs)
        @echo Linking $@
        @ar -rcs $@ $^
 
-$(LIBIRC_SHARED): $(lib_objs)
+$(LIBIRC_SHARED): $(libirc_objs)
        $(LD) -shared $(LDFLAGS) -Wl,-soname,$(LIBIRC_SONAME) -o $@ $^
 
 cscope.out::
@@ -224,7 +226,7 @@ clean::
        @echo Removing dependency files
        @rm -f $(dep_files)
        @echo Removing object files and executables
-       @rm -f src/*.o lib/*.o daemon/*.o testsuite/check ctrlproxy$(EXEEXT) testsuite/*.o *~
+       @rm -f src/*.o $(libircdir)/*.o daemon/*.o testsuite/check ctrlproxy$(EXEEXT) testsuite/*.o *~
        @rm -f linestack-cmd$(EXEEXT) ctrlproxy-admin$(EXEEXT)
        @rm -f ctrlproxyd$(EXEEXT)
        @rm -f $(LIBIRC_STATIC) $(LIBIRC_SHARED)
@@ -289,11 +291,11 @@ check-gdb:
 examples:: example/libfoo.$(SHLIBEXT) example/libirc-simple
 
 example/libfoo.$(SHLIBEXT): example/foo.o
-example/foo.o: CFLAGS+=-Ilib
+example/foo.o: CFLAGS+=-I$(libircdir)
 
 example/libirc-simple: example/irc_simple.o $(LIBIRC)
        $(CC) -o $@ $^
 
-example/irc_simple.o: CFLAGS+=-Ilib
+example/irc_simple.o: CFLAGS+=-I$(libircdir)
 
 -include $(dep_files)

diff --git a/daemon/main.c b/daemon/main.c
index cc066c2f828b16139934d38d8e3ee32f1b0befb8..58599db826e3413d737af5928105401b572eee3b 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -48,7 +48,7 @@
 
 #include "ssl.h"
 
-#include "lib/socks.h"
+#include "libirc/socks.h"
 
 struct ctrlproxyd_config;
 extern char my_hostname[];

diff --git a/lib/client.c b/libirc/client.c
similarity index 100%
rename from lib/client.c
rename to libirc/client.c

diff --git a/lib/client.h b/libirc/client.h
similarity index 100%
rename from lib/client.h
rename to libirc/client.h

diff --git a/lib/connection.c b/libirc/connection.c
similarity index 100%
rename from lib/connection.c
rename to libirc/connection.c

diff --git a/lib/connection.h b/libirc/connection.h
similarity index 100%
rename from lib/connection.h
rename to libirc/connection.h

diff --git a/lib/irc.h b/libirc/irc.h
similarity index 100%
rename from lib/irc.h
rename to libirc/irc.h

diff --git a/lib/isupport.c b/libirc/isupport.c
similarity index 100%
rename from lib/isupport.c
rename to libirc/isupport.c

diff --git a/lib/isupport.h b/libirc/isupport.h
similarity index 100%
rename from lib/isupport.h
rename to libirc/isupport.h

diff --git a/lib/libirc.h b/libirc/libirc.h
similarity index 100%
rename from lib/libirc.h
rename to libirc/libirc.h

diff --git a/lib/line.c b/libirc/line.c
similarity index 100%
rename from lib/line.c
rename to libirc/line.c

diff --git a/lib/line.h b/libirc/line.h
similarity index 100%
rename from lib/line.h
rename to libirc/line.h

diff --git a/lib/listener.c b/libirc/listener.c
similarity index 99%
rename from lib/listener.c
rename to libirc/listener.c
index becd2e477158fbe437baa8c7d0e84b9916523b3d..55f8765ac3c3f9c6686cb2fda3ed78ac30d9982b 100644 (file)
--- a/lib/listener.c
+++ b/libirc/listener.c
@@ -20,7 +20,7 @@
 */
 
 #include "internals.h"
-#include "lib/listener.h"
+#include "libirc/listener.h"
 #include "ssl.h"
 
 #include <sys/stat.h>

diff --git a/lib/listener.h b/libirc/listener.h
similarity index 100%
rename from lib/listener.h
rename to libirc/listener.h

diff --git a/lib/socks.h b/libirc/socks.h
similarity index 100%
rename from lib/socks.h
rename to libirc/socks.h

diff --git a/lib/state.c b/libirc/state.c
similarity index 100%
rename from lib/state.c
rename to libirc/state.c

diff --git a/lib/state.h b/libirc/state.h
similarity index 100%
rename from lib/state.h
rename to libirc/state.h

diff --git a/lib/transport.c b/libirc/transport.c
similarity index 100%
rename from lib/transport.c
rename to libirc/transport.c

diff --git a/lib/transport.h b/libirc/transport.h
similarity index 100%
rename from lib/transport.h
rename to libirc/transport.h

diff --git a/lib/url.c b/libirc/url.c
similarity index 100%
rename from lib/url.c
rename to libirc/url.c

diff --git a/lib/url.h b/libirc/url.h
similarity index 100%
rename from lib/url.h
rename to libirc/url.h

diff --git a/lib/util.c b/libirc/util.c
similarity index 100%
rename from lib/util.c
rename to libirc/util.c

diff --git a/lib/util.h b/libirc/util.h
similarity index 100%
rename from lib/util.h
rename to libirc/util.h