diff options
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rwxr-xr-x | tools/MocList | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 279ad05..a38b804 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,10 +3,10 @@ bin_PROGRAMS = dgedit dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(AO_LIBS) \ - $(shell ../tools/MocList o ) qrc_dgedit.o + $(shell $(top_srcdir)/tools/MocList $(top_srcdir)/src o ) qrc_dgedit.o dgedit_CXXFLAGS = -g $(SNDFILE_CXXFLAGS) $(QT_CFLAGS) $(AO_CFLAGS) \ - -DLOCALEDIR='"$(localedir)"' + -DLOCALEDIR='"$(localedir)"' -I$(top_srcdir) AM_CXXFLAGS = $(QT_CFLAGS) dgedit_TRANSLATIONS = \ @@ -84,7 +84,7 @@ EXTRA_DIST = \ $(HDRS) \ dgedit.qrc -dgedit_MOC = $(shell ../tools/MocList cc ) +dgedit_MOC = $(shell $(top_srcdir)/tools/MocList $(top_srcdir)/src cc ) BUILT_SOURCES = \ $(dgedit_MOC) \ diff --git a/tools/MocList b/tools/MocList index 8111e37..6aff3ee 100755 --- a/tools/MocList +++ b/tools/MocList @@ -1,9 +1,9 @@ # -*- mode: shell-script; sh-shell: bash; sh-indentation: 2 -*- -if [ "$1" = "cc" ]; then - grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.cc/g'| xargs echo; -elif [ "$1" = "o" ]; then - grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.o/g'| xargs echo; -elif [ "$1" = "h" ]; then - grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | cut -d'/' -f3 | xargs echo; +if [ "$2" = "cc" ]; then + grep "Q_OBJECT" $1/*.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.cc/g'| xargs echo; +elif [ "$2" = "o" ]; then + grep "Q_OBJECT" $1/*.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.o/g'| xargs echo; +elif [ "$2" = "h" ]; then + grep "Q_OBJECT" $1/*.h | LC_ALL=C sort | cut -d: -f1 | cut -d'/' -f3 | xargs echo; fi |