Changeset 3868

Timestamp:

May 6, 2005, 11:13:27 AM (21 years ago)

Author:

rhl

Message:

Assume that they said 'jhbuild build xpa'

File:

• trunk/pois/swig/Makefile.am (modified) (4 diffs)

trunk/pois/swig/Makefile.am

@@ -14 +14 @@
 SWIG += -Drestrict= -Dinline=
 
-AM_CFLAGS += $(XPA_CFLAGS) -I../src
+AM_CFLAGS += -I../src
 #
 # Libraries to install
@@ -28 +28 @@
 #
 libpsLibSwig_la_LDFLAGS  = -module
+libpsLibSwig_la_LIBADD   = $(PSLIB_LIBS)
+
 libpsLibSwig_la_SOURCES = \
         psLibSwig_wrap.c \
@@ -37 +39 @@
 # Now for XPA
 #
-# N.b. environment variable XPA_DIR must be set externally
-#
-XPA_CFLAGS = -I$(XPA_DIR)/include
-XPA_LIBS   = -L$(XPA_DIR)/lib -lxpa
-
 libxpaSwig_la_LIBADD       = $(PSLIB_LIBS)
-libxpaSwig_la_LIBADD      += $(XPA_LIBS)
+libxpaSwig_la_LIBADD      += -lxpa
 
 libxpaSwig_la_LDFLAGS = -module
@@ -51 +48 @@
 
 xpaSwig.py xpaSwig_wrap.c : xpaSwig.i p_psSwig.i
-        $(SWIG) $(PS_INCLUDES) -I$(XPA_DIR)/include xpaSwig.i
+        $(SWIG) $(PS_INCLUDES) xpaSwig.i
         @case "$(SWIG)" in \
           *-perl*) \