diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2009-12-14 23:08:26 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2009-12-14 23:08:26 -0500 |
| commit | a1932948b44b3452dcb824c14c25656b9d643582 (patch) | |
| tree | ef0893b254eeadea209473d9dc924cd46d2ef83a | |
| parent | 73b51687f4a5512b77bd0524e18b66231d213802 (diff) | |
More initial tweaking & added empty global header.
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | inc/global.hxx | 7 | ||||
| -rw-r--r-- | source/main.cxx | 1 |
4 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a6e960c..c57c30b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,6 +3,7 @@ EXEC=test BINDIR=@BINDIR@ SRCDIR=@ROOTDIR@/source INCDIR=@ROOTDIR@/inc +OBJDIR=@OBJDIR@ LDFLAGS= -lsal -lcppuhelpergcc3 -lcppu -L@OOO_INSTALL_PATH@/program CXXCPP=-I@UNOHEADER_PATH@ -I$(INCDIR) @@ -15,12 +16,18 @@ CXXFLAGS= \ $(CXXCPP) OBJFILES= \ - main.o + $(OBJDIR)/main.o -all: $(EXEC) +all: pre $(EXEC) + +pre: + mkdir $(OBJDIR) 2>/dev/null || /bin/true $(EXEC): $(OBJFILES) $(CXX) -o $@ $(OBJFILES) -lc -main.o: $(SRCDIR)/main.cxx +$(OBJDIR)/main.o: $(SRCDIR)/main.cxx $(CXX) -o $@ $(CXXFLAGS) -c $< + +clean: + rm -rf $(OBJDIR) $(EXEC) diff --git a/configure.ac b/configure.ac index d01d2a5..fa7450d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_LANG_RESTORE ROOTDIR=. AC_SUBST(ROOTDIR) -OBJDIR=./obj +OBJDIR=$ROOTDIR/obj AC_SUBST(OBJDIR) OOO_INSTALL_PATH=$with_ooo diff --git a/inc/global.hxx b/inc/global.hxx new file mode 100644 index 0000000..84648ea --- /dev/null +++ b/inc/global.hxx @@ -0,0 +1,7 @@ + +#ifndef __GLOBAL_HXX__ +#define __GLOBAL_HXX__ + + + +#endif diff --git a/source/main.cxx b/source/main.cxx index d04a801..fd03ad8 100644 --- a/source/main.cxx +++ b/source/main.cxx @@ -1,3 +1,4 @@ +#include "global.hxx" int main() { |