Download as
Browse Code »

Commit d143f510400e680c818ad3c0f29c91b8698fe5c8

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

Corrigindo erros na incorporação do plugin dbus ao projeto principal

Showing 1 changed file with 6 additions and 4 deletions   Show diff stats
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @d143f51
@@ -95,12 +95,12 @@ endif @@ -95,12 +95,12 @@ endif
95 $(OBJDBG)/%.o: %.c $(DEPENDS) 95 $(OBJDBG)/%.o: %.c $(DEPENDS)
96 @echo " CC `basename $@`" 96 @echo " CC `basename $@`"
97 @$(MKDIR) `dirname $@` 97 @$(MKDIR) `dirname $@`
98 - @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $< 98 + @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
99 99
100 $(OBJRLS)/%.o: %.c $(DEPENDS) 100 $(OBJRLS)/%.o: %.c $(DEPENDS)
101 @echo " CC `basename $@`" 101 @echo " CC `basename $@`"
102 @$(MKDIR) `dirname $@` 102 @$(MKDIR) `dirname $@`
103 - @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $< 103 + @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
104 104
105 105
106 #---[ Release targets ]-------------------------------------------------------- 106 #---[ Release targets ]--------------------------------------------------------
@@ -110,7 +110,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so @@ -110,7 +110,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so
110 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) 110 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
111 @echo " CCLD `basename $@`" 111 @echo " CCLD `basename $@`"
112 @$(MKDIR) `dirname $@` 112 @$(MKDIR) `dirname $@`
113 - @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) 113 + @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
114 114
115 #---[ Debug targets ]---------------------------------------------------------- 115 #---[ Debug targets ]----------------------------------------------------------
116 116
@@ -119,13 +119,14 @@ Debug: $(BINDBG)/plugins/$(MODULE_NAME).so @@ -119,13 +119,14 @@ Debug: $(BINDBG)/plugins/$(MODULE_NAME).so
119 $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) 119 $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o)
120 @echo " CCLD `basename $@`" 120 @echo " CCLD `basename $@`"
121 @$(MKDIR) `dirname $@` 121 @$(MKDIR) `dirname $@`
122 - @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) 122 + @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
123 123
124 #---[ Misc targets ]----------------------------------------------------------- 124 #---[ Misc targets ]-----------------------------------------------------------
125 125
126 debug-service: $(BINDBG)/@PACKAGE_NAME@d 126 debug-service: $(BINDBG)/@PACKAGE_NAME@d
127 127
128 dbus-glue.h: pw3270dbus.xml 128 dbus-glue.h: pw3270dbus.xml
  129 + @$(MKDIR) .tmp
129 @$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=pw3270_dbus $^ 130 @$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=pw3270_dbus $^
130 131
131 $(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o) 132 $(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o)
@@ -138,5 +139,6 @@ cleandebug-service: clean @@ -138,5 +139,6 @@ cleandebug-service: clean
138 clean: 139 clean:
139 @rm -fr $(OBJDIR) 140 @rm -fr $(OBJDIR)
140 @rm -fr $(BINDIR) 141 @rm -fr $(BINDIR)
  142 + @rm -fr .tmp
141 @rm -f dbus-glue.h 143 @rm -f dbus-glue.h
142 @find . -name "*~" -exec rm -f {} \; 144 @find . -name "*~" -exec rm -f {} \;