Download as
Browse Code »

Commit 2acc50f318909da4046e80920eda277099999c8f

Authored by perry.werneck@gmail.com
1 parent 0043521e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Simplificando construção dos .hpp do libreoffice

Showing 1 changed file with 14 additions and 23 deletions   Show diff stats
src/openoffice/Makefile.in
  Diff comments   View file @2acc50f
@@ -60,6 +60,8 @@ include $(CLASSLIBDIR)/class.mak @@ -60,6 +60,8 @@ include $(CLASSLIBDIR)/class.mak
60 60
61 OBJDIR=.obj 61 OBJDIR=.obj
62 BINDIR=.bin 62 BINDIR=.bin
  63 +RDBDIR=.rdb
  64 +URDDIR=.urd
63 65
64 OBJDBG=$(OBJDIR)/Debug 66 OBJDBG=$(OBJDIR)/Debug
65 BINDBG=$(BINDIR)/Debug 67 BINDBG=$(BINDIR)/Debug
@@ -78,35 +80,25 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ @@ -78,35 +80,25 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
78 80
79 #---[ Rules ]------------------------------------------------------------------ 81 #---[ Rules ]------------------------------------------------------------------
80 82
81 -include/com/sun/star/uno/%.hpp: %.rdb 83 +$(URDDIR)/%.urd: %.idl
82 @echo $@ ... 84 @echo $@ ...
83 @$(MKDIR) `dirname $@` 85 @$(MKDIR) `dirname $@`
84 - @$(CPPUMAKER) -O./include $(TYPES_RDB) $< 86 + $(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
85 87
86 -include/com/sun/star/registry/%.hpp: %.rdb 88 +$(URDDIR)/%.urd: /usr/share/idl/libreoffice/%.idl
87 @echo $@ ... 89 @echo $@ ...
88 @$(MKDIR) `dirname $@` 90 @$(MKDIR) `dirname $@`
89 - $(CPPUMAKER) -O./include $(TYPES_RDB) $<  
90 -  
91 -%.urd: %.idl  
92 - @echo $@ ...  
93 - @$(MKDIR) `dirname $@`  
94 - @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< 91 + $(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
95 92
96 -%.urd: /usr/share/idl/libreoffice/com/sun/star/uno/%.idl 93 +$(RDBDIR)/%.rdb: $(URDDIR)/%.urd
97 @echo $@ ... 94 @echo $@ ...
98 @$(MKDIR) `dirname $@` 95 @$(MKDIR) `dirname $@`
99 - @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< 96 + $(REGMERGE) $@ /UCR $<
100 97
101 -%.urd: /usr/share/idl/libreoffice/com/sun/star/registry/%.idl 98 +include/%.hpp: $(RDBDIR)/%.rdb
102 @echo $@ ... 99 @echo $@ ...
103 @$(MKDIR) `dirname $@` 100 @$(MKDIR) `dirname $@`
104 - @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<  
105 -  
106 -%.rdb: %.urd  
107 - @echo $@ ...  
108 - @$(MKDIR) `dirname $@`  
109 - @$(REGMERGE) $@ /UCR $< 101 + $(CPPUMAKER) -O./include $(TYPES_RDB) $<
110 102
111 $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \ 103 $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
112 $(foreach CLS, $(basename $(UNO_CLASSES)), include/com/sun/star/uno/$(CLS).hpp) \ 104 $(foreach CLS, $(basename $(UNO_CLASSES)), include/com/sun/star/uno/$(CLS).hpp) \
@@ -118,7 +110,7 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \ @@ -118,7 +110,7 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
118 110
119 #---[ UNO targets ]------------------------------------------------------------ 111 #---[ UNO targets ]------------------------------------------------------------
120 112
121 -include/pw3270/lib3270.hpp: pw3270.rdb 113 +include/pw3270/lib3270.hpp: $(RDBDIR)/pw3270.rdb
122 @echo $@ ... 114 @echo $@ ...
123 @$(MKDIR) `dirname $@` 115 @$(MKDIR) `dirname $@`
124 @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $< 116 @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $<
@@ -128,8 +120,6 @@ include/pw3270/lib3270.hpp: pw3270.rdb @@ -128,8 +120,6 @@ include/pw3270/lib3270.hpp: pw3270.rdb
128 120
129 Debug: $(BINDBG)/pw3270.uno@DLLEXT@ 121 Debug: $(BINDBG)/pw3270.uno@DLLEXT@
130 122
131 -cleanDebug: clean  
132 -  
133 $(BINDBG)/pw3270.uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) 123 $(BINDBG)/pw3270.uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
134 @echo $@ ... 124 @echo $@ ...
135 @$(MKDIR) `dirname $@` 125 @$(MKDIR) `dirname $@`
@@ -138,11 +128,12 @@ $(BINDBG)/pw3270.uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$ @@ -138,11 +128,12 @@ $(BINDBG)/pw3270.uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$
138 128
139 #---[ Misc targets ]----------------------------------------------------------- 129 #---[ Misc targets ]-----------------------------------------------------------
140 130
141 -all: include/pw3270/lib3270.hpp 131 +cleanDebug: clean
142 132
143 clean: 133 clean:
144 @rm -f *.urd 134 @rm -f *.urd
145 - @rm -f *.rdb 135 + @rm -fr $(RDBDIR)
  136 + @rm -fr $(URDDIR)
146 @rm -fr include 137 @rm -fr include
147 @rm -fr $(OBJDIR) 138 @rm -fr $(OBJDIR)
148 @rm -fr $(BINDIR) 139 @rm -fr $(BINDIR)