Changeset d296c9a for Makefile.am

Timestamp:

Jul 18, 2010, 4:48:15 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, 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:

• Makefile.am (modified) (3 diffs)

Makefile.am

@@ -39 +39 @@
            $(GIT_FLAGS)
 
-BASE_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
+CODELIST_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
      commands.c global.c text.c fmtext.c editwin.c util.c logging.c \
      perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
@@ -46 +46 @@
      aim.c buddy.c buddylist.c style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
-     glib_compat.c filterproc.c
+     glib_compat.c mainpanel.c msgwin.c sepbar.c
+
+NORMAL_SRCS = filterproc.c window.c windowcb.c
+
+BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
 
 GEN_C = varstubs.c perlglue.c
@@ -68 +72 @@
         $(AM_V_GEN)perl $< $(sort $(filter-out $<,$+)) > $@
 
-owl_prototypes.h.new: codelist.pl varstubs.c $(BASE_SRCS)
+owl_prototypes.h.new: codelist.pl varstubs.c $(CODELIST_SRCS)
         $(AM_V_GEN)perl $< $(sort $(filter-out $<,$+)) > $@