Changeset d8d63a2 for Makefile

Timestamp:

2006-12-05T20:40:17Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7740c4c

Parents:

f4aa393 (diff), 55078f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] wilmer

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o unix.o url.o user.o util.o
+objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
-subdirs = protocols 
+subdirs = protocols lib
 
 # Expansion of variables
@@ -43 +43 @@
 
 distclean: clean $(subdirs)
-        rm -f Makefile.settings config.h
+        rm -f Makefile.settings config.h bitlbee.pc
         find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
         $(MAKE) -C test distclean