Changeset 3fbce97 for Makefile

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-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 $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o
+objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_cap.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o
 headers = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
 subdirs = lib protocols
@@ -30 +30 @@
 
 install: install-bin install-doc install-plugins
+        @echo
+        @echo Installed successfully
+        @echo
         @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
         @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
@@ -35 +38 @@
         @echo If you want to start BitlBee using systemd, try \"make install-systemd\".
 endif
-        @echo
-
-.PHONY:   install   install-bin   install-etc   install-doc install-plugins install-systemd \
-        uninstall uninstall-bin uninstall-etc uninstall-doc \
+        @echo To be able to compile third party plugins, run \"make install-dev\"
+        @echo
+
+.PHONY:   install   install-bin   install-etc   install-doc install-plugins install-systemd install-dev \
+        uninstall uninstall-bin uninstall-etc uninstall-doc uninstall-etc \
         all clean distclean tar $(subdirs) doc