diff options
| author | marco <marco@conformal.com> | 2011-11-02 10:46:31 -0500 |
|---|---|---|
| committer | marco <marco@conformal.com> | 2011-11-02 10:46:31 -0500 |
| commit | d28c0498460a52333f1d5a0c9d6d8de264f881a6 (patch) | |
| tree | ec0b74c72f2b77061cac0e223b1183845399992c | |
| parent | a8d12992b3dec4550ca163914bcfc118dc02ff16 (diff) | |
| parent | e1becca5e8edb5857560ff505037d877aa28bd70 (diff) | |
| download | xombrero-d28c0498460a52333f1d5a0c9d6d8de264f881a6.tar.gz | |
Merge branch 'master' of ssh://opensource.conformal.com/git/xxxterm
| -rw-r--r-- | freebsd/Makefile | 4 | ||||
| -rw-r--r-- | linux/Makefile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/freebsd/Makefile b/freebsd/Makefile index 34c2b6f..a43989f 100644 --- a/freebsd/Makefile +++ b/freebsd/Makefile @@ -23,11 +23,13 @@ xxxterm.o: ../xxxterm.o marco.o: ../marco.o +about.o: ../about.o + inspector.o: ../inspector.o ../xxxterm.o: ../javascript.h -xxxterm: xxxterm.o freebsd.o marco.o inspector.o +xxxterm: xxxterm.o freebsd.o marco.o about.o inspector.o $(CC) $(LDFLAGS) -o $@ *.o $+ $(LDADD) install: all diff --git a/linux/Makefile b/linux/Makefile index 2568ad3..697dc75 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -18,7 +18,7 @@ javascript.h: ../js-merge-helper.pl ../hinting.js xxxterm.o: javascript.h -xxxterm: ../marco.o ../inspector.o ../xxxterm.o linux.o +xxxterm: ../marco.o ../about.o ../inspector.o ../xxxterm.o linux.o $(CC) $(LDFLAGS) -o $@ $+ $(LDADD) install: all |