Changeset 4aa0f6b for Makefile

Timestamp:

2010-06-07T14:31:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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:

Merging killerbee stuff, bringing all the bleeding-edge stuff together.

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-#objects = chat.o
 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
 headers = account.h bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
@@ -83 +82 @@
 install-dev:
         mkdir -p $(DESTDIR)$(INCLUDEDIR)
-        install -m 0644 $(headers) $(DESTDIR)$(INCLUDEDIR)
+        install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
+        for i in $(headers); do install -m 0644 $(SRCDIR)$$i $(DESTDIR)$(INCLUDEDIR); done
         mkdir -p $(DESTDIR)$(PCDIR)
         install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
@@ -94 +94 @@
 install-etc:
         mkdir -p $(DESTDIR)$(ETCDIR)
-        install -m 0644 motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-        install -m 0644 bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+        install -m 0644 $(SRCDIR)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+        install -m 0644 $(SRCDIR)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
@@ -111 +111 @@
         @$(MAKE) -C $@ $(MAKECMDGOALS)
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@