Changes in Makefile [4af3050:4fca1db]

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.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
+objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.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/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/nogaim.h
 subdirs = lib protocols
 
@@ -82 +82 @@
 install-dev:
         mkdir -p $(DESTDIR)$(INCLUDEDIR)
-        install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
-        for i in $(headers); do install -m 0644 $(SRCDIR)$$i $(DESTDIR)$(INCLUDEDIR); done
+        install -m 0644 $(headers) $(DESTDIR)$(INCLUDEDIR)
         mkdir -p $(DESTDIR)$(PCDIR)
         install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
@@ -94 +93 @@
 install-etc:
         mkdir -p $(DESTDIR)$(ETCDIR)
-        install -m 0644 $(SRCDIR)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-        install -m 0644 $(SRCDIR)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+        install -m 0644 motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+        install -m 0644 bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
@@ -111 +110 @@
         @$(MAKE) -C $@ $(MAKECMDGOALS)
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: %.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@