Use @GLIB_CONFIG@ and @LIBIDL_CONFIG@ autoconf variables to find glib-config and libIDL config, rather than hardcoding thier names.
Thanks to Greg Roelofs for this fix. git-svn-id: svn://10.0.0.236/trunk@28041 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
9fda39f2f3
commit
9f7c7f3abc
@ -36,14 +36,14 @@ CSRCS = \
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# XXX replace with proper configure test for glib
|
||||
CFLAGS += $(shell glib-config --cflags) $(shell libIDL-config --cflags)
|
||||
CFLAGS += $(shell @GLIB_CONFIG@ --cflags) $(shell @LIBIDL_CONFIG@ --cflags)
|
||||
|
||||
# seperate out to get dependancies right
|
||||
LIBXPT=$(DIST)/lib/libxpt.a
|
||||
|
||||
# XXX need configure test
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell glib-config --libs) \
|
||||
$(shell libIDL-config --libs)
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell @GLIB_CONFIG@ --libs) \
|
||||
$(shell @LIBIDL_CONFIG@ --libs)
|
||||
|
||||
PROGS = $(OBJDIR)/xpidl
|
||||
|
||||
|
||||
@ -36,14 +36,14 @@ CSRCS = \
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# XXX replace with proper configure test for glib
|
||||
CFLAGS += $(shell glib-config --cflags) $(shell libIDL-config --cflags)
|
||||
CFLAGS += $(shell @GLIB_CONFIG@ --cflags) $(shell @LIBIDL_CONFIG@ --cflags)
|
||||
|
||||
# seperate out to get dependancies right
|
||||
LIBXPT=$(DIST)/lib/libxpt.a
|
||||
|
||||
# XXX need configure test
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell glib-config --libs) \
|
||||
$(shell libIDL-config --libs)
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell @GLIB_CONFIG@ --libs) \
|
||||
$(shell @LIBIDL_CONFIG@ --libs)
|
||||
|
||||
PROGS = $(OBJDIR)/xpidl
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user