aboutsummaryrefslogtreecommitdiff
path: root/scaf
diff options
context:
space:
mode:
Diffstat (limited to 'scaf')
-rw-r--r--scaf/Makefile2
-rw-r--r--scaf/Makefile.config4
-rw-r--r--scaf/Makefile.config.in2
-rw-r--r--scaf/pdp/pdp_ca_system.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/scaf/Makefile b/scaf/Makefile
index d9af670..a75695c 100644
--- a/scaf/Makefile
+++ b/scaf/Makefile
@@ -39,5 +39,5 @@ install: all
#Check if pd is installed in $(prefix)/lib/pd.
#If this fails the pdp_scaf lib and the docs won't be installed.
test -d $(prefix)/lib/pd
- install -m 755 pdp_scaf.pd_linux $(prefix)/lib/pd/externs
+ install -m 755 pdp_scaf.pd_linux $(prefix)/lib/pd/extra
install -m 644 doc/*.pd $(prefix)/lib/pd/doc/5.reference
diff --git a/scaf/Makefile.config b/scaf/Makefile.config
index 4faea70..4ddb31c 100644
--- a/scaf/Makefile.config
+++ b/scaf/Makefile.config
@@ -6,13 +6,13 @@
prefix=/usr/local
-PDP_CA_INCLUDE = -I/home/tom/pd/packet/include -I/home/tom/pd/packet/scaf/include
+PDP_CA_INCLUDE = -I/usr/local/include/pdp -I/home/tom/pdcvs/externals/pdp/scaf/include
PDP_CA_LIBS = -ldl -lm
DEFAULT_RULES_LIB = /usr/local/lib/scaf/default.scafo
PDP_CA_AFLAGS =
#--gstabs
PDP_CA_CFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \
- -Wall -W -Wstrict-prototypes -Werror \
+ -Wall -W -Wstrict-prototypes -I../include -I../../include \
-Wno-unused -Wno-parentheses -Wno-switch -g $(PDP_CFLAGS) $(PD_CFLAGS) \
-DPDP_CA_RULES_LIB=\"$(DEFAULT_RULES_LIB)\"
# -Wshadow
diff --git a/scaf/Makefile.config.in b/scaf/Makefile.config.in
index 12927d3..6515eaf 100644
--- a/scaf/Makefile.config.in
+++ b/scaf/Makefile.config.in
@@ -12,7 +12,7 @@ DEFAULT_RULES_LIB = @DEFAULT_RULES_LIB@
PDP_CA_AFLAGS =
#--gstabs
PDP_CA_CFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \
- -Wall -W -Wstrict-prototypes -Werror \
+ -Wall -W -Wstrict-prototypes -I../include -I../../include \
-Wno-unused -Wno-parentheses -Wno-switch -g $(PDP_CFLAGS) $(PD_CFLAGS) \
-DPDP_CA_RULES_LIB=\"$(DEFAULT_RULES_LIB)\"
# -Wshadow
diff --git a/scaf/pdp/pdp_ca_system.c b/scaf/pdp/pdp_ca_system.c
index acbab34..2ecf43c 100644
--- a/scaf/pdp/pdp_ca_system.c
+++ b/scaf/pdp/pdp_ca_system.c
@@ -296,7 +296,7 @@ void pdp_scaf_setup(void)
t_pdp_conversion_program *program;
/* babble */
- post ("PDP: pdp_scaf extension library");
+ post ("PDP: cellular automata extension library");
/* setup modules */
pdp_ca_setup();