Skip to content

Commit

Permalink
Enable creation of dllpiqilib_stubs.so as a part of piqilib bytecode …
Browse files Browse the repository at this point in the history 
…build (#49)

It turned out this is necessary for OCaml toplevel and utop to work with
piqilib/piqirun.ext
  • Loading branch information
@alavrik
alavrik committed Mar 23, 2015
1 parent 1f95d83 commit c17f83d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions piqilib/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/piqi_json_parser.ml

/libpiqilib_stubs.a
/dllpiqilib_stubs.so
4 changes: 1 addition & 3 deletions piqilib/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ include $(PIQI_ROOT)/make/Makefile.ocaml
RESULT = piqilib

LIBINSTALL_FILES += \
$(wildcard $(RESULT).cma $(RESULT).cmxa $(RESULT).$(EXT_LIB) $(RES_CLIB)) \
$(wildcard $(RESULT).cma $(RESULT).cmxa $(RESULT).$(EXT_LIB) $(RES_CLIB) $(DLLSONAME)) \
$(wildcard *.cmi) \


STATIC = 1 # force creation of static library (don't create dlls)

PACKS = ulex easy-format xmlm base64 bytes


Expand Down

2 comments on commit c17f83d

@KennethAdamMiller
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah man, yeah we want it to integrate much more cleanly with the OCamlMakefile, since my change was dirty. I strove hard for hours to dig out how to make my change a clean and straightforward. Augmenting the makefile the way I did worked, but wasn't the most professional and proper. I agree with this alternative additional support.

Absolutely man, I just wish I had come up with a change that were so clean with regards to using OCamlMakefile, but I was ready to push code. Thanks so much, now I can take what I've learned from this with me.

@KennethAdamMiller
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, just comment when you've pushed the version, I will update and test.

Please sign in to comment.