Changeset d296c9a for Makefile.am


Ignore:
Timestamp:
Jul 18, 2010, 4:48:15 PM (11 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, release-1.7, release-1.8, release-1.9
Children:
205e164
Parents:
1cc9b615 (diff), 8bba1ae (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 'owl_window'

Conflicts:
	global.c
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r9d27ee8 rd296c9a  
    3939           $(GIT_FLAGS)
    4040
    41 BASE_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
     41CODELIST_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
    4242     commands.c global.c text.c fmtext.c editwin.c util.c logging.c \
    4343     perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
     
    4646     aim.c buddy.c buddylist.c style.c errqueue.c \
    4747     zbuddylist.c popexec.c select.c wcwidth.c \
    48      glib_compat.c filterproc.c
     48     glib_compat.c mainpanel.c msgwin.c sepbar.c
     49
     50NORMAL_SRCS = filterproc.c window.c windowcb.c
     51
     52BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
    4953
    5054GEN_C = varstubs.c perlglue.c
     
    6872        $(AM_V_GEN)perl $< $(sort $(filter-out $<,$+)) > $@
    6973
    70 owl_prototypes.h.new: codelist.pl varstubs.c $(BASE_SRCS)
     74owl_prototypes.h.new: codelist.pl varstubs.c $(CODELIST_SRCS)
    7175        $(AM_V_GEN)perl $< $(sort $(filter-out $<,$+)) > $@
    7276
Note: See TracChangeset for help on using the changeset viewer.