Changeset f4d817d for Makefile.in

Timestamp:

Feb 11, 2009, 12:37:35 PM (15 years ago)

Author:

Sam Hartman <hartmans@mit.edu>

Branches:

debian

Children:

14489be

Parents:

3bc7358 (diff), b4c270c (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 'barnowl-1.0.5-security' into debian

Conflicts:

	.gitignore

File:

• Makefile.in (modified) (3 diffs)

Makefile.in

@@ -5 +5 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@/barnowl
 bindir = @bindir@
@@ -25 +26 @@
      regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
      keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \
-     aim.c buddy.c buddylist.c timer.c style.c errqueue.c \
-     zbuddylist.c muxevents.c popexec.c obarray.c select.c wcwidth.c \
+     aim.c buddy.c buddylist.c style.c errqueue.c \
+     zbuddylist.c popexec.c obarray.c select.c wcwidth.c \
      glib_compat.c
 OWL_SRC = owl.c
@@ -53 +54 @@
         $(ATHSTATIC) $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
 
-tester: $(AUTOGEN) $(OBJS) tester.o
+tester: $(AUTOGEN) $(OBJS) tester.o libfaim
         $(ATHSTATIC) $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)