|
 |
60dbba1 |
--- crm114-20060704a-BlameRobert.src/megatest.sh.r 2006-07-08 04:48:12.000000000 +0200
|
|
|
60dbba1 |
+++ crm114-20060704a-BlameRobert.src/megatest.sh 2006-08-16 22:56:23.000000000 +0200
|
|
|
60dbba1 |
@@ -50,7 +50,7 @@
|
|
|
60dbba1 |
crm skudtest.crm
|
|
|
60dbba1 |
crm statustest.crm
|
|
|
60dbba1 |
#./exectest.crm
|
|
|
60dbba1 |
-./unionintersecttest.crm
|
|
|
60dbba1 |
+crm unionintersecttest.crm
|
|
|
60dbba1 |
crm beeptest.crm
|
|
|
60dbba1 |
crm userdirtest.crm
|
|
|
60dbba1 |
crm windowtest.crm <<-EOF
|
|
|
60dbba1 |
--- crm114-20060704a-BlameRobert.src/Makefile.r 2006-07-08 04:48:12.000000000 +0200
|
|
|
60dbba1 |
+++ crm114-20060704a-BlameRobert.src/Makefile 2006-08-16 22:53:12.000000000 +0200
|
|
|
60dbba1 |
@@ -47,7 +47,7 @@
|
|
|
60dbba1 |
# Tell the compiler full optimization, allow debugging, and warn on every
|
|
|
60dbba1 |
# possible error
|
|
|
60dbba1 |
#
|
|
|
60dbba1 |
-CFLAGS += -O3 -g -Wall
|
|
|
60dbba1 |
+#CFLAGS += -O3 -g -Wall
|
|
|
60dbba1 |
# turn this one on for no optimization debugging.
|
|
|
60dbba1 |
#CFLAGS += -O0 -g -Wall
|
|
|
60dbba1 |
# turn this one on for really picayune debugging.
|
|
|
60dbba1 |
@@ -56,7 +56,7 @@
|
|
|
60dbba1 |
# Choose between static and dynamic linking (we recommend static linking)
|
|
|
60dbba1 |
# Comment this out if you want dynamic linking
|
|
|
60dbba1 |
#
|
|
|
60dbba1 |
-LDFLAGS += -static
|
|
|
60dbba1 |
+#LDFLAGS += -static
|
|
|
60dbba1 |
#
|
|
|
60dbba1 |
# Any standard install flags? We nominally use protection 755
|
|
|
60dbba1 |
INSTALLFLAGS += -m 755
|
|
|
60dbba1 |
@@ -314,13 +314,13 @@
|
|
|
60dbba1 |
crm_util_errorhandlers.o \
|
|
|
60dbba1 |
crm_osbf_maintenance.o -lm -ltre -o osbf-util
|
|
|
60dbba1 |
|
|
|
60dbba1 |
-cssdiff: cssdiff.c crm_util_errorhandlers.o $(HFILES)
|
|
|
60dbba1 |
+cssdiff: cssdiff.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
|
|
|
60dbba1 |
$(CC) $(CFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' -c cssdiff.c -o cssdiff.o
|
|
|
60dbba1 |
$(CC) $(CFLAGS) $(LDFLAGS) \
|
|
|
60dbba1 |
crm_util_errorhandlers.o \
|
|
|
60dbba1 |
crm_str_funcs.o -ltre cssdiff.o -o cssdiff
|
|
|
60dbba1 |
|
|
|
60dbba1 |
-cssmerge: cssmerge.c crm_util_errorhandlers.o $(HFILES)
|
|
|
60dbba1 |
+cssmerge: cssmerge.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
|
|
|
60dbba1 |
$(CC) $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \
|
|
|
60dbba1 |
crm_str_funcs.o \
|
|
|
60dbba1 |
crm_util_errorhandlers.o \
|
|
|
60dbba1 |
@@ -354,29 +354,29 @@
|
|
|
60dbba1 |
|
|
|
60dbba1 |
install_utils:
|
|
|
60dbba1 |
$(MAKE) cssmerge cssutil cssdiff osbf-util
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
# if you don't have EMACS installed in the default place, you
|
|
|
60dbba1 |
# won't get the crm114-mode.el automatically.
|
|
|
60dbba1 |
- -install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
install_tre: crm114_tre
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
# use different name so we can keep it around along with default one
|
|
|
60dbba1 |
# and same VER_SUFFIX postfix
|
|
|
60dbba1 |
install_gnu: crm114_gnu
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) crm114_gnu $(BINDIR)/crmg$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) crm114_gnu $(DESTDIR)$(BINDIR)/crmg$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
install_binary_only: FORCE
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
- -install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
uninstall: FORCE
|
|
|
60dbba1 |
-rm -rf $(BINDIR)/crm$(VER_SUFFIX)
|