Commit b23f768e97dc3980a5e4e25c4712202784d344e9
1 parent
99307e31
Exists in
master
Separando plugin java do projeto principal.
Showing
2 changed files
with
15 additions
and
5 deletions
Show diff stats
configure.ac
| @@ -265,6 +265,16 @@ AC_SUBST(jvm_arch) | @@ -265,6 +265,16 @@ AC_SUBST(jvm_arch) | ||
| 265 | AC_SUBST(JDK_HOME) | 265 | AC_SUBST(JDK_HOME) |
| 266 | AC_SUBST(JRE_HOME) | 266 | AC_SUBST(JRE_HOME) |
| 267 | 267 | ||
| 268 | +dnl --------------------------------------------------------------------------- | ||
| 269 | +dnl Check for GTK | ||
| 270 | +dnl --------------------------------------------------------------------------- | ||
| 271 | + | ||
| 272 | +PKG_CHECK_MODULES( [GTK], [gtk+-3.0], AC_DEFINE(HAVE_GTK)) | ||
| 273 | + | ||
| 274 | +AC_SUBST(GTK_LIBS) | ||
| 275 | +AC_SUBST(GTK_CFLAGS) | ||
| 276 | +AC_SUBST(GTK_VERSION,`$PKG_CONFIG --modversion gtk+-3.0`) | ||
| 277 | + | ||
| 268 | 278 | ||
| 269 | dnl --------------------------------------------------------------------------- | 279 | dnl --------------------------------------------------------------------------- |
| 270 | dnl Check for integer types & library functions | 280 | dnl Check for integer types & library functions |
src/plugin/Makefile.in
| @@ -43,7 +43,7 @@ datarootdir=@datarootdir@ | @@ -43,7 +43,7 @@ datarootdir=@datarootdir@ | ||
| 43 | BASEDIR=@BASEDIR@ | 43 | BASEDIR=@BASEDIR@ |
| 44 | SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) | 44 | SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) |
| 45 | 45 | ||
| 46 | -OBJDIR=$(BASEDIR)/.obj | 46 | +OBJDIR=$(BASEDIR)/.obj/plugin |
| 47 | OBJDBG=$(OBJDIR)/Debug | 47 | OBJDBG=$(OBJDIR)/Debug |
| 48 | OBJRLS=$(OBJDIR)/Release | 48 | OBJRLS=$(OBJDIR)/Release |
| 49 | 49 | ||
| @@ -73,11 +73,10 @@ LDFLAGS=@LDFLAGS@ | @@ -73,11 +73,10 @@ LDFLAGS=@LDFLAGS@ | ||
| 73 | 73 | ||
| 74 | #---[ Rules ]---------------------------------------------------------------------------- | 74 | #---[ Rules ]---------------------------------------------------------------------------- |
| 75 | 75 | ||
| 76 | -DEPENDS=../include/*.h Makefile | ||
| 77 | - | ||
| 78 | $(OBJDBG)/%.o: \ | 76 | $(OBJDBG)/%.o: \ |
| 79 | %.cc \ | 77 | %.cc \ |
| 80 | - $(DEPENDS) | 78 | + Makefile \ |
| 79 | + ../include/*.h | ||
| 81 | 80 | ||
| 82 | @echo $< ... | 81 | @echo $< ... |
| 83 | @$(MKDIR) `dirname $@` | 82 | @$(MKDIR) `dirname $@` |
| @@ -87,7 +86,8 @@ $(OBJDBG)/%.o: \ | @@ -87,7 +86,8 @@ $(OBJDBG)/%.o: \ | ||
| 87 | 86 | ||
| 88 | $(OBJRLS)/%.o: \ | 87 | $(OBJRLS)/%.o: \ |
| 89 | %.cc \ | 88 | %.cc \ |
| 90 | - $(DEPENDS) | 89 | + Makefile \ |
| 90 | + ../include/*.h | ||
| 91 | 91 | ||
| 92 | @echo $< ... | 92 | @echo $< ... |
| 93 | @$(MKDIR) `dirname $@` | 93 | @$(MKDIR) `dirname $@` |