From 0043521e3feb3d5e9d153dc49f15a45046ccb3e2 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Fri, 28 Mar 2014 20:17:33 +0000 Subject: [PATCH] Work in progress --- src/openoffice/Makefile.in | 23 ++++++++++++++++------- src/openoffice/loffice3270.cbp | 2 +- src/openoffice/testprogram.cc | 4 ++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/openoffice/Makefile.in b/src/openoffice/Makefile.in index 5b29b06..b30a0f1 100644 --- a/src/openoffice/Makefile.in +++ b/src/openoffice/Makefile.in @@ -56,7 +56,7 @@ MKDIR=@MKDIR_P@ CLASSLIBDIR=../classlib include $(CLASSLIBDIR)/class.mak -#---[ lib3270 common class ]--------------------------------------------------- +#---[ Paths ]------------------------------------------------------------------ OBJDIR=.obj BINDIR=.bin @@ -78,6 +78,16 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ #---[ Rules ]------------------------------------------------------------------ +include/com/sun/star/uno/%.hpp: %.rdb + @echo $@ ... + @$(MKDIR) `dirname $@` + @$(CPPUMAKER) -O./include $(TYPES_RDB) $< + +include/com/sun/star/registry/%.hpp: %.rdb + @echo $@ ... + @$(MKDIR) `dirname $@` + $(CPPUMAKER) -O./include $(TYPES_RDB) $< + %.urd: %.idl @echo $@ ... @$(MKDIR) `dirname $@` @@ -88,6 +98,11 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ @$(MKDIR) `dirname $@` @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< +%.urd: /usr/share/idl/libreoffice/com/sun/star/registry/%.idl + @echo $@ ... + @$(MKDIR) `dirname $@` + @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< + %.rdb: %.urd @echo $@ ... @$(MKDIR) `dirname $@` @@ -101,7 +116,6 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \ $(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $< # $(DBG_CFLAGS) $(CXXFLAGS) $(LIB3270_CFLAGS) -DLIBNAME=\"$(BINDBG)/$(PROGRAM_NAME).uno@DLLEXT@\" -o $@ -c $< - #---[ UNO targets ]------------------------------------------------------------ include/pw3270/lib3270.hpp: pw3270.rdb @@ -109,11 +123,6 @@ include/pw3270/lib3270.hpp: pw3270.rdb @$(MKDIR) `dirname $@` @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $< -include/com/sun/star/uno/%.hpp: %.rdb - @echo $@ ... - @$(MKDIR) `dirname $@` - @$(CPPUMAKER) -O./include $(TYPES_RDB) $< - #---[ Debug targets ]---------------------------------------------------------- diff --git a/src/openoffice/loffice3270.cbp b/src/openoffice/loffice3270.cbp index 2783c49..5b9f569 100644 --- a/src/openoffice/loffice3270.cbp +++ b/src/openoffice/loffice3270.cbp @@ -2,7 +2,7 @@ -